1.2.0 Branch and Karaf 2.3.1
1.2.0 Branch and Karaf 2.3.1
1.2.0 Branch and Karaf 2.3.1
trunk fixes
trunk - snapshot update.
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml