Merge pull request #4164 from mbogosian/master
fixes #4163 (lockunspent help docs are (partially) wrong)