Knowing the GTIDs before the MASTER_GTID_WAIT call should help us figure out why it doesn't seem to be working as expected.
A link with the old directory name is provided.