https://github.com/jclouds/jclouds/pull/403 (which is still open in case anyone has time to merge it).
Merged to master. Looks like we need to do a bit of work to backport this, though :-( [1]
ap [1] https://github.com/jclouds/jclouds/pull/403#issuecomment-47428075