Fix issues of TomP2P upgrade

(not all tests running yet)

Signed-off-by: nicoruti <nico.rutishauser@diligent-it.com>