Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Consistently reuse project version number in pom Adapt pom.xml accordingly. Change-Id: I076b5f6c98f84b4a43e2adb219ecde74137f187b