Merge branch 'pr-p4-fabric-fix' into 'develop'

fix: naming and logging in fabric-tna test

See merge request !350