Merge branch 'apearce-LHCBPS-1807' into '2017-patches'

Truth-match objects beyond the standard HLT2 reconstruction in Tesla

See merge request !246

(cherry picked from commit 89ed5446)

86cfcf02 Truth match additional Track and ProtoParticle containers.
5d0b2b2c Hard-code the list of extra locations.
1b95995a Clarify NeverFail logic.