[Reviewer: Matt] Check for route headers in OPTIONS

Matt, can you review this change to check for a route header in an OPTIONS request. 

Tested in UTs