EUCA-7521 removing canonical ID generation on account retrieval
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing