Miscellaneous .gitlab-ci.yml cleanups
This is a follow-up to !3279 (merged), which I did not get a chance to review before it had to be merged (because I missed the fact that isc-projects/images!36 will mess CI up unless !3279 (merged) is merged immediately afterwards - d'oh!).