Merge branch 'chasse_hlt2_pp_thor' into 'master'

add hyperon lines to hlt2_pp_thor and ensure the functor cache is build for this config

See merge request lhcb/Moore!1056
5 jobs for master in 3 minutes and 31 seconds (queued for 1 second)
Name Stage Failure
failed
build-docs Docs
  File "/builds/jonrob/Moore/Hlt/Hlt2Conf/python/Hlt2Conf/standard_particles.py", line 32, in <module>
from .algorithms import (
File "/builds/jonrob/Moore/Hlt/Hlt2Conf/python/Hlt2Conf/algorithms.py", line 29, in <module>
from PyConf.Algorithms import (CombineParticles, FilterDesktop,
ImportError: cannot import name 'ParticleContainerMerger' from 'PyConf.Algorithms' (unknown location)
make: *** [graphviz/hlt2_line_example_data_flow.gv] Error 1
make: Leaving directory `/builds/jonrob/Moore/doc'
WARNING build is incompatible with last nightly, stopping
Cleaning up file based variables
ERROR: Job failed: exit code 77