AUI-1156 - SF
No dashes on alloy.json keys
Merge branch 'master' into master-deprecated