Backport changes from trunk.


git-svn-id: https://svn.apache.org/repos/asf/libcloud/branches/0.12.x@1490422 13f79535-47bb-0310-9956-ffa450edef68