SERVER-14131 Fix initialization order
Merge remote-tracking branch 'upstream/master'