reviewed by epowell fix the integration tests


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