EUCA-6198: use tryEnable, not manipulate the services map directly
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing