Merge "rdbms: make DatabaseMysql::masterPosWait() handle inactive GTIDs"