SERVER-11005 Re-enable FIPS test
Merge remote-tracking branch 'upstream/master'