[Merge] lp:~corey.bryant/cinder/2014.2.2 into lp:~ubuntu-server-dev/cinder/juno

[Corey Bryant]

Note that this needs python-eventlet socket_timeout support.  See: https://bugs.launchpad.net/ubuntu/+source/nova/+bug/1419117
-- 
https://code.launchpad.net/~corey.bryant/cinder/2014.2.2/+merge/248961
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~corey.bryant/cinder/2014.2.2 into lp:~ubuntu-server-dev/cinder/juno.