SERVER-12548 add indexes to config.lockpings and config.locks in mongos
Merge remote-tracking branch 'upstream/master'