finalized CC-94 and fixed ZEN-14344
Merge pull request #400 from zenoss/CC-94continued

finalized CC-94 and fixed ZEN-14344