Merge proposals dependent on lp://qastaging/~zaspire/libunity-webapps/revert-unconscious-changes

1. revert-unconscious-changes
2. Dependent merge proposals