Merge branch 'stable-2.10'

* stable-2.10:
  Update version in pom to 2.10

Conflicts:
	pom.xml

Change-Id: I226c0333b197b462d73b17853ebcee9dea9e2a09
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>