PROV-856 Fix transactions to support "dry run" mode in importer
PROV-886 improve locking
Merge branch 'develop' of github.com:collectiveaccess/providence into develop

Conflicts:
	app/helpers/importHelpers.php
	app/models/ca_data_importers.php