[NEXUS-5526] Fix mutual trust in HC4

https://issues.sonatype.org/browse/NEXUS-5526

Fixes according to discussion in above issue + IT verifying the fix works