Lockfile update and skip questionable test#4901

bjlittle merged 2 commits intoSciTools:mainSciTools/iris:mainfrom

rcomer:skip-regrid-testrcomer/iris:skip-regrid-testCopy head branch name to clipboard