Some cleanup
Merge branch 'master' into 2.0

Conflicts:
	agent/jvm/src/main/java/org/jolokia/jvmagent/JolokiaHttpHandler.java