REVIEW: [NEXUS-5526] Fix mutual trust in HC4

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