Pulling MGC up to date with 21.6
Test renaming had been done in 21.6 already.
CMakeLists change is important to get in here
Lots of updated to MadGraphUtils that are swept up -- virtually no additions in this set w.r.t. 21.6, except for fixing one flake error