Merged to 1.7.x. I didn't actually merge this PR. I just cherry picked 33f244dbabcfc07ebfc624fca7b4372ba3b751b1 into 1.7.x rather than try to work out if this PR differed from #309 on master.
--- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds/pull/310#issuecomment-39223462
