SERVER-14184 Remove unused S2 macros that conflict on OS X Yosemite
Merge remote-tracking branch 'upstream/master'