Backport PR 500 to 1.8.x

PR: https://github.com/jclouds/jclouds/pull/500
JIRA: https://issues.apache.org/jira/browse/JCLOUDS-296