Please review branch feature/ZEN-15514

https://jira.zenoss.com/browse/ZEN-15514