Final changes to the CUG pre cylc-6 release.

Closes #1130.
Ditto. (essentially).