merged at [master](http://git-wip-us.apache.org/repos/asf/jclouds/commit/af4bd3a8) and [2.0.x](http://git-wip-us.apache.org/repos/asf/jclouds/commit/7785379d)
-- 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/1135#issuecomment-327295436
