cherry-picked into master. I have probably >10 commits to port to 1.8.x (earlier ones conflict due to JCLOUDS-653). I'll get those in before adding more.
--- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds-labs/pull/96#issuecomment-60342538
