add support for bamboo maven sharing
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	pom.xml
Merge branch '1.12'