Cleaned up and condensed down into a single commit for merging now. 7u51 build [running](https://jclouds.ci.cloudbees.com/view/Java%207/job/jclouds-java-7u51/33/console)
--- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds/pull/263#issuecomment-33277561
