Merge branch 'jenkins-working-branch' of github.com:rackerlabs/repose

Conflicts:
	repose-aggregator/core/core-lib/pom.xml