SERVER-9038 Merged in codereview fixes