EUCA-7492
fixed lingering refs to moved classes
Merge pull request #231 from eucalyptus/EUCA-7492

EUCA-7492