SEC-2230: Polish Headers JavaConfig