Merge proposals dependent on lp://staging/~mc-return/compiz/compiz.merge-fix1100184-composite-is-already-required-by-opengl

1. compiz.merge-fix1100184-composite-is-already-required-by-opengl
2. Dependent merge proposals