Merge branch 'trunk' of github.com:apache/libcloud into only-call-super-if-needed