Merge "Increase KEYSTONE_LOCKOUT_DURATION to 10"