ensuring Makefile is a bit more complete
Merge branch 'master' into nodetool-release