SERVER-13951 ROLLBACK_ENABLED=1
Merge remote-tracking branch 'upstream/master'