Merge dropwizard-0.7 changes in, and call this clustermate-0.10.x (created 0.9 branch earlier)