APD Reset Password
Put code in common (messages)
Merge branch 'APD-254-IMR' into develop