missing LoKi functor fix for 2017-patches

Cherry pick missing LoKi functor fix to 2018-patches

See merge request !3548 (merged)

(cherry picked from commit c73f254c)

edb231b7 Merge branch 'johndan-mctreefunctors' into 'run2-patches'