Merge proposals dependent on lp://qastaging/~compiz-team/compiz-compizconfig-gconf/compiz-compizconfig-gconf.fix_802373

1. compiz-compizconfig-gconf.fix_802373
2. Dependent merge proposals