EUCA-9394: Set explicit timeout when using HttpClient
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing