GUI-1138
updated units to match what we had in 3.4 (for alarm metric types)
GUI-1138
fix unit label to be blank for 'None' and 'Count'
Merge pull request #831 from eucalyptus/GUI-1138

GUI-1138
passed Jenkins http://10.111.4.12/job/Koala-SUITE/366/