Merge "Revert an accidental error modification of config item help message"