Backport openstack-swift and rackspace-cloudfiles to 1.7

This PR is to backport the changes on master to the 1.7 branch.

JIRA: 
https://issues.apache.org/jira/browse/JCLOUDS-423
https://issues.apache.org/jira/browse/JCLOUDS-299