Port changes to AmpGen into master

Port changes to 'master'. In principle this is identical but fro some extra include to what in Sim09 as many of the modernisation and cmake changes are present there.

It was prepare by cherry-picking MR !438 (merged) and looking and solving the conflicts that were mostly due to code block changes with formatting differences.

It also includes fix of DtoKKpipi_v2 model that was in !499 (merged) for merge to this branch