Use the two new rackspace machines.
Merge branch 'master' of github.com:plone/jenkins.plone.org

Conflicts:
	inventory.txt