general cleanup of Makefile
Merge branch 'master' into nodetool-release