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

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