SERVER-13635: remove some includes
Merge remote-tracking branch 'upstream/master'