SERVER-13701 Init TwoD stage in constructor.
Merge remote-tracking branch 'upstream/v2.6' into v2.6