SERVER-16313 make override of checkpointDelaySecs with syncdelay work properly
Merge remote-tracking branch 'upstream/master'