Bug 1064720 - Group overrides lost during scale

Caused the overrides to reset because they weren't being passed to 
calculate_ops.

[merge]