Fix failing forked test

We had fixed this previously, so I think we just took the wrong side of
a conflict when merging from upstream.
Merge pull request #67 from Stanford-Online/stv/rc-munge

Fix failing forked test
change wording of password reset pages