Merge proposals dependent on lp://staging/~mc-return/compiz/compiz.merge-fix1172913-blacklist-composite-and-opengl

1. compiz.merge-fix1172913-blacklist-composite-and-opengl
2. Dependent merge proposals