Merge proposals dependent on lp://qastaging/~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.fix_965220

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