merged.
Some conflicts backporting. @andrewgaul - did you backport your code?

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/745#issuecomment-101465926

Reply via email to