Merge branch 'trunk' of http://gitbox.apache.org/repos/asf/libcloud into trunk