Fix AS handling when request URI is external
Remove spurious commit
Tidy up whitespace
Merge pull request #556 from Metaswitch/issue519

[Reviewer: Mike] Fix AS handling when request URI is external