Update MC TCK creation for 2017 Turbo support
Also includes a fix that I somehow didn't spot in !473 (merged). To be cherry-picked to 2018-patches.
Edited by Alex Pearce
Also includes a fix that I somehow didn't spot in !473 (merged). To be cherry-picked to 2018-patches.