Merge pull request #270 from ssamartyn/develop

Fix for ZEN-15240
ZEN-13447
Merge pull request #271 from zenoss/feature/ZEN-13447

ZEN-13447
Fixes ZEN-15633
Merge pull request #272 from zenoss/feature/ZEN-15633

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

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