pull in new amberdb
getDataSource() now returns the same datasource instance.
Revert "Revert changes."

This reverts commit d0883e5acf9ab3bbf2e956ddd07a0c81421a440d.
Merge tag '1.3.1' into production
Merge branch 'uat' into production

Conflicts:
	pom.xml
Merge pull request #886 from nla/production

Production