Check for route headers in OPTIONS
Merge branch 'dev' of github.com:Metaswitch/sprout into iss545
Commonise route header checking
Update comments
Merge pull request #546 from Metaswitch/iss545

[Reviewer: Matt] Check for route headers in OPTIONS