#9329: [GRIN Travel] Update and cleanup header
Merge branch 'version-4.6' into header_cleanup_version-4.6_t9329
#9329: [GRIN Travel] Update and cleanup header - adjusting adminLink position