Merge proposals dependent on lp://qastaging/~compiz-team/compiz/build-fixes-part-5-gsettings

1. build-fixes-part-5-gsettings
2. Dependent merge proposals