Fix merge conflict on momqueryservice.py. Moved on trunk, but changed on this branch.
Solve by replacing the moved file with the changed file (thus, move the changed file over the moved file).
Careful checking of (JD's) changes shows this is correct; the changes are preserved.
Other moved files did not cause conflicts, since they were not changed.

Task #10118: Disable casacore table locking, use "multifile" storage in casacore to create fewer files

Task #8993: Accidentally reverted conflicting changes to Docker directory when merging the trunk (commit r35701), whilst the trunk version should have been adopted.

Task #8361: Add cap_sys_admin to outputProc to allow setting I/O priorities, fix real-time budget for outputProc to allow setting RT priorities

Task #9192: Use C++11, Ubuntu 16.04, OpenBLAS, AOFlagger 2.8.0, latest casacore/casarest/python-casacore, for increased performance

Task #8887: Reverting back to Ubuntu 14.04, C++98, and fewer optimisations, to avoid AOFlagger crash in NDPPP

Task #8887 #8993: Build lofar Docker images with C++11 and optimisations, use OpenBLAS instead of BLAS+LAPACK, do not build tests, pull casacore from master and casarest from jjdmol/casarest repo until C++11 fixes have been merged to main repo, drop superfluous -DLOG4CPLUS_ROOT