Merge branch 'stable-2.7'

Conflicts:
	pom.xml

Change-Id: I1aa397364c36a78e5725d59cf586af5d040cc350