doc fixes
Fixed tests, failure introduced on travis by fixes for #135
Merge branch 'master' into 2.0

Conflicts:
	service/discovery/src/test/java/org/jolokia/service/discovery/MulticastUtilTest.java