Catalyst 4 upgrade follow up fixes#2133

chewi merged 2 commits intomainflatcar/scripts:mainfrom

chewi/catalyst-4-fixesflatcar/scripts:chewi/catalyst-4-fixesCopy head branch name to clipboard