Merge Rackspace specific changes