Fixed client and adapted all options to the new libraries.
Preparations for release 1.2.1
Updated pom to new release plugin
[maven-release-plugin] prepare release v1.2.1
[maven-release-plugin] prepare for next development iteration
Increased versions
Updated some resource files
Some typos fixed.
Merge branch 'master' into 2.0

Conflicts:
	agent/jvm/pom.xml
	agent/osgi-bundle/pom.xml
	agent/osgi/pom.xml
	agent/pom.xml
	agent/war/pom.xml
	client/java/pom.xml
	client/javascript/pom.xml
	client/pom.xml
	it/core/pom.xml
	it/pom.xml
	it/war/pom.xml
	pom.xml
	server/core/src/main/java/org/jolokia/server/core/Version.java
	server/detector/pom.xml
	service/history/pom.xml
	service/jmx/pom.xml
	service/jsr160/pom.xml
	src/site/resources/templates/jolokia-access.xml
	src/site/site.xml
	support/spring/pom.xml
	tools/roo/pom.xml
	tools/siteskin/pom.xml
	tools/test-util/pom.xml
Merged in 1.2.1