Fixup all relative includes refering to parent directories
SERVER-2094 distinct only wants the field it's distinct-ing over
Merge remote-tracking branch 'upstream/master'