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

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