Reduce locking in MDR.

@bug W-2135674@

@rev fabbott@
Merging origin/goliver/master-pending-mdr-lock into master