Merge "Add a NotLockingAccounts credentials provider"