Made sure that --login-path is the first argument for all mysql/mysqldump command lines.  These commands will fail otherwise.
Merge branch 'test' into prod