Changes to use master passcode, and upgrade steps for PasscodeManager