More clean.sh related cleanups

Merged Matthijs Mekking requested to merge matthijs-more-clean.sh-related-cleanups-v9_14 into v9_14

Merge request reports