SERVER-13635 change lib deps
Merge remote-tracking branch 'upstream/master'