Changing the p4d in use from 15.2 in ftp to mainline, and, adding alternative configurations to run r15.2 and r16.1 p4d locally.
We'll run through these alternatives first. The distribution test runs will only run mainline builds (well, for the HWS mainline).
I have *NO CLUE* how to make this smooth in the EC module configuration. So I'm going the route of syncing everything, because the platform variables set for my builds don't seem to match up with the p4d variables.