Merge proposals dependent on lp://qastaging/~robertcarr/libunity-webapps/u1-use-preinstalled-desktop

1. u1-use-preinstalled-desktop
2. Dependent merge proposals