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

ZEN-13447