SERVER-14343 leaner include paths
Merge remote-tracking branch 'upstream/master'