DP-157 Please approve for self merge

We'll need to update the hive11 job to use the new script name, and then we can continue to use exactly the same script for 12.