fixes CC-597
Merge pull request #1 from zenoss/feature/CC-597

fixes CC-597