Merge "watchdog should ignore wrong password failures"