Merge proposals dependent on lp://qastaging/~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_874842

1. compiz-libcompizconfig.fix_874842
2. Dependent merge proposals