ZEN-10943: ported from ZEN-10997
ZEN-10943: removed redundant test
Merge pull request #32 from zenoss/feature/ZEN-10943

Feature/zen 10943