Compiz

Merge proposals dependent on lp://qastaging/~compiz-team/compiz/compiz.build-fixes-part-1

  1. compiz.build-fixes-part-1
  2. Dependent merge proposals

lp://qastaging/~compiz-team/compiz/compiz.build-fixes-part-1 has no merge proposals.