Fixes ZEN-11568
Merge pull request #274 from zenoss/feature/ZEN-11568

Fixes ZEN-11568
Improved code for ZEN-13546
Merge remote branch 'upstream/develop' into develop