Master switchover fails on 5.6 with wildcard characters in user's hostname

[ksoftirqd]

Hello,

Master switchover fails on 5.6 when replication user's hostname has wildcard characters.
E.g. if replication user is added as repl@% the following line will be executed b/c the script tries to fetch password for the replication [email protected]() and when it's stored in database as user@% -- it is just ignored and the script fails:

ERROR: The specified replication user is using a different password that the one specified.
Use the --force option to force the use of the user specified with  --rpl-user and new password.
# Errors found. Switchover aborted.

Whereas with 5.7 it works ok, since the script tries to connect to the server using provided user/password instead of comparing passwords (after f0fd574).

Could we consider using this block unconditionally? Seems like it works ok with versions < 5.7 too.