NR-636 : No wrong-user-password info

removed some commented code
Merge remote-tracking branch 'origin/devel' into devel