Fixes when merging in extraction#223

James Bruten (james-bruten-mo) wants to merge 4 commits into

MetOffice:mainMetOffice/SimSys_Scripts:mainfrom

james-bruten-mo:extract_fixesjames-bruten-mo/SimSys_Scripts:extract_fixesCopy head branch name to clipboard