merged at [master](http://git-wip-us.apache.org/repos/asf/jclouds/commit/90498ae0) and [2.0.x](http://git-wip-us.apache.org/repos/asf/jclouds/commit/1ffbe59b)
-- 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/pull/1177#issuecomment-363110650
