Merged to [master](http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/30a500f8) and [2.0.x](http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/96fca7eb). The commit in this PR contained changes not related to this PR (it has 108 files) because the branch was not properly rebased. I've rebased it before merging and the commit includes only the relevant changes. Thanks @code4clouds!
-- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds-labs/pull/412#issuecomment-345975107
