Fix circular import; reviewed by Joseph
Merge branch 'develop' of https://github.com/zenoss/zenoss-prodbin into develop