Draft: Merge master in main

These are the commits in master than are not in main

pick 5aeb6d2 Start of refactoring of ImageQualityIndicators
pick 7eca054 Beamstop shadow for ID30B
pick 5ed695d Attempt to fix problem with Dozor crashing on ID23-1 and ID30B
pick 1ef675f Fix for small batches
pick 9f5eaa3 Added working directory to dozorm2 output
pick 6b481de Reverted change for waiting for the next image batch
pick 01601f2 Added '-avs' command line option for DozorM2
pick 33d1c7c Added new unit test for DozorM2
pick be20d54 Changed Ubuntu 20.04 hdf5 library to dectris-neggia
pick 4e7bc27 Minor changes: removed unused import, added spaces around '+'
pick 2ddf38c New MOSFLM indexing exec test
pick 16fd252 Fix of typo
pick a68c2e3 Added missing loadTestImage
pick dff415a Fix for getLibrary unit test
pick 4655447 Fix for bug when the path contained the string "master" but not "master.h5"
pick d315ff5 Fix for problem with ESRF tests - the EDNA2_SITE config was not reset after being changed
pick 51c73a6 Fix for bug in mesh results - the image was off with one image number
pick 2f1a7da Changed default time out for waiting for images to 300 s
pick e259615 Fixes for the latest version of DozorM2
pick 5bf57a3 Excluded from tests