Always running SQL_CHANGE_MASTER breaks GTID setup (at least on 10.1.24)
as it resets MASTER_USE_GTID. So only run it when not using GTID.
Also, fold SQL_SET_GTID into the existing "if" bloc for simplicity.