Merge proposals dependent on lp:~ci-train-bot/unity-lens-photos/unity-lens-photos-ubuntu-artful-2794

1. unity-lens-photos-ubuntu-artful-2794
2. Dependent merge proposals