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
add display of selected copyRoles
Merge pull request #882 from nla/js-dsc-1150

add display of selected copyRoles
use id instead of class
Merge pull request #883 from nla/js-dsc-1150

use id instead of class
Greyed out collection field for existing upload
Merge pull request #885 from nla/nn-dsc-1116-template

Greyed out collection field for existing upload
Merge branch 'uat' into production

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

Production
Merge branch 'master' into feature/acm-DSC-80