This PR includes code that is already in master, and it is quite hard to review. Can you please rebase it to the latest master version?
--- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds-labs/pull/134#issuecomment-74840815
