Merge pull request #102 from shackbarth/19227

issue #19227: different email text if password reset is due to new user
Merge pull request #18 from xtuple/master

Catch up.