SERVER-10870 - Replaced reference to mongod.conf with references to mongodb.conf.master and mongodb.conf.subagent
SERVER-11341 - Added merge module as a variable to wixproj and buildenterprisemsi.bat
SERVER-11178: fix caching of IndexDescriptors with drop
SERVER-11301 added retry logic to movechunk commands for slow hosts