LL-736 #resolved Added password recovery functionality + tests
Merge remote-tracking branch 'origin/master'