SERVER-14352: clean up static init so no longer need DEFINE
Merge remote-tracking branch 'upstream/master'