Merge "Remove some properties from overcloud.yaml Controller group"