Merge "Improve the user lock config options help message"