Merge "Add force option to password policy"