Test case fix
Merge pull request #842 from lingalamadhukar/bug_fixes

#MIFOSX-988,#MIFOSX-989,#MIFOSX-987,#MIFOSX-952
Merge pull request #841 from lingalamadhukar/MIFOSX-751

#MIFOSX-751 enforce password reset
#MIFOSX-991,#MIFOSX-979 Comment Fixes