* CLDC-3838: Update devise settings to allow email unlock strategy * Try just explicitly doing the unlock on password reset * Add test for user being unlocked