Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	distribution/bin/jdbc/pom.xml
	distribution/bin/pom.xml
Update - jpacontainer still does not work