Fix for BUG_20
Merge branch 'develop' of https://github.com/ssvsergeyev/ZenPacks.zenoss.AWS into develop