SERVER-13459 migration rollback needs to use original metadata
Merge remote-tracking branch 'upstream/master'