Backport commits from 0.12.x.


git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1470326 13f79535-47bb-0310-9956-ffa450edef68