Fixes warm upgrade for real now

Fixes EUCA-7610
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing