@mcdonnell-john I've just squashed the previous commits and pushed them to [master](http://git-wip-us.apache.org/repos/asf/jclouds/commit/c73b82b5) and [1.9.x](http://git-wip-us.apache.org/repos/asf/jclouds/commit/9cd78bfc). The commits have already been mirrored to GitHub, so if you start a clean branch from master you should be able to start with the changes in this PR and in a clean state.
The right changes are merged now, so I'm closing this PR. Feel free to raise a new PR to add more fixes starting from the latest master. Does this work for you? --- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds/pull/845#issuecomment-146318152