SERVER-14184 Remove unused S2 macros that conflict on OS X Yosemite

(cherry picked from commit 759b6e8cabfb745b712b5ffd0748561129c3b421)
Merge remote-tracking branch 'upstream/v2.6' into v2.6