[Reviewer: Matt] Use P-Served-User

Matt, can you please review this change to look at the P-Served-User header instead of the route headers