Merge proposals dependent on lp://qastaging/~smspillaz/compiz-core/compiz-core.more-sound-reparenting-behaviour

1. compiz-core.more-sound-reparenting-behaviour
2. Dependent merge proposals