Merge proposals dependent on lp://qastaging/~smspillaz/compiz-core/compiz-core.variant-prpoposed-fix

1. compiz-core.variant-prpoposed-fix
2. Dependent merge proposals