Merge branch 'feature/ZEN-9726' into develop
Fixes ZEN-15839
Merge pull request #4 from zenoss/feature/ZEN-15839

Feature/zen 15839