SERVER-13644 Fix command line censorship
SERVER-13635: fix os x compile
Merge remote-tracking branch 'upstream/master'