Fixes ZEN-15493
More Fixes for ZEN-14593
fix comments
Merge pull request #262 from zenoss/feature/ZEN-15493

Feature/zen 15493