...
Merge branch 'master' of https://github.com/cowtowncoder/ClusterMate

Conflicts:
	clustermate-service/src/main/java/com/fasterxml/clustermate/service/sync/SyncPullResponse.java