Comment 6 for bug 1435370

I've attached a suggested work around.

This does an additional SHOW CREATE USER and then modifies the output to:
CREATE USER IF NOT EXISTS .....; -- to create the user (this is replication safe)
ALTER USER <rest of output of SHOW CREATE USER>; -- to modify the credentials as needed.

This should work on 5.6 and later.
It does not try to generate "backwards compatible grants" from 5.7 servers to 5.6. That may be useful later.