Fixes ZEN-13580
Merge pull request #293 from zenoss/feature/ZEN-13580

Fixes ZEN-13580
Merge pull request #292 from ssamartyn/develop

Fix for ZEN-13243
Improve message for ZEN-13243