Make compatible with Zenoss 4.1.
Merge branch 'hotfix/1.0.2'