issue #1022 fix deadlocks by taking lock on experiment table
Merge branch 'master' of github.com:CellProfiler/CellProfiler

Conflicts:
	cellprofiler/modules/exporttodatabase.py