Fixes updates to pom.xml files for Rackspace branding

Also rebased against master