Merge "Use DPM's counter for invalid password attempts" into pi-dev