Description of problem:

(from rdickens@)

At login screen, testing “Password Reset” and “Login Information” options.

Test 1
Entered correct login name and matching email address in “Password Reset” fields.
Result: message “**help.credentials.passwordsent**”.
Expected result:  A message similar to that of Satellite 5.7”, which I believe is: “"Password reset information sent to root@localhost."

Test 2
Entered valid login name, but mis-matching email address in “Password Reset” fields.
Result: message “**help.credentials.invalidemail**”.
Expected result: A more human language-like message, for example: 

Version-Release number of selected component (if applicable):

5.8.0

Additional info:
Looks like merge-conflict resolved incorrectly removed a block of L10N keys