ASGARD-1092 - NPE on adding new scaling policy and alarm using Java 7
Merge pull request #246 from jgritman/java7-scaling-policy

ASGARD-1092 - NPE on adding new scaling policy and alarm using Java 7