NEXUS-6569: Backport of std hdr fixes, part2

Original PR
https://github.com/sonatype/nexus-oss/pull/529
Merge pull request #530 from sonatype/nexus-2.8.x-NEXUS-6569-std-headers-part2

Nexus 2.8.x nexus 6569 std headers part2