Merged
Merge branch 'develop' of github.com:ssOleg/ZenPacks.zenoss.AWS into develop