Cleaning up comments and removing Rackspace specific verbiage. Change-Id: I36675fcc84908043f6c2182de2232fe0bdd15e33