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.