bringing over fixes to Walrus deadlock. Fixes EUCA-9136
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing