Refactor and update for atom hopper service and new requirements - V1-B-42639'
Updating fix for errorPage in headers V1-D-12106
undoing temp fix for errorpage, will push hotfix later if neeeded