Merge proposals dependent on lp://qastaging/~mc-return/compiz/compiz.merge-fix1182794-screenshot-not-compatible-with-unityshell.0

1. compiz.merge-fix1182794-screenshot-not-compatible-with-unityshell.0
2. Dependent merge proposals