Lofar release 4 0 -> master

Merge bug fixes on LOFAR-Release-4_0 back into master

Merge request reports

Loading