Fixes #4604: correct typo in the lock file extension, plus correct wording
Merge pull request #259 from ncharles/bug_4604/edv/correct_typo_in_lock_file_ext

Fixes #4604: correct typo in the lock file extension, plus correct wordi...
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9'