tiny refactoring to simplify dw upgrade (if we go there)
Merge branch 'master' of https://github.com/cowtowncoder/ClusterMate

Conflicts:
	pom.xml

Moving CallFailure