Move password variable declaration to the top to avoid ANSI C compiler warning.
Merge branch 'standby-clone-password-support'