fix circular import reviewed by cphilips


git-svn-id: http://dev.zenoss.com/svnint/trunk/core@74411 f5df01ce-0320-0410-9ed9-ddcd13c732cc