[RICPLT-2585 / RICPLT-1528] Fix E2TermInit payload / xAppMock fixes