Add changes for #1240
Add changes for #1240

Closes #1240

apache/libcloud,apache/libcloud,Scalr/libcloud,ByteInternet/libcloud,Scalr/libcloud,apache/libcloud,ByteInternet/libcloud,andrewsomething/libcloud,mistio/libcloud,mistio/libcloud,Kami/libcloud,Scalr/libcloud,andrewsomething/libcloud,andrewsomething/libcloud,ByteInternet/libcloud,Kami/libcloud,Kami/libcloud,mistio/libcloud