Merge branch 'master' of https://github.com/erikzz/jmx2munin

Conflicts:
	contrib/jmx2munin.sh
Merge branch 'master' of https://github.com/erikzz/jmx2munin