SERVER-15180 Fix typos in lock manager tests and a heap1 error message

Closes #768

Signed-off-by: Benety Goh <benety@mongodb.com>
Merge remote-tracking branch 'upstream/master'