EUCA-7292
Fixed label mismatches in expando template and found a bug in scalinggroupeditproperties, that caused alarms to not get set at all on new policies and old policies to lose their alarms.
Merge branch 'EUCA-7292' into maint/3.3/testing