Fix conflict resolution of !132
Despite this fix, the L0App tests, modified by !132 (merged) are quite unhappy. They seemed to be ok before the merge. Part of the reason is LHCb@e51fde8b which is removing too much, but it is not the whole story. I give up fixing L0App tests for now, assuming we'll get the green light to drop Run 2 code altogether.
/cc @olupton