Add P-Visited-Network-Id headers to the live tests
Combine headers in same if block
Merge pull request #35 from Metaswitch/p-visited-network-id

[Reviewer: Rob] Add P-Visited-Network-Id headers to the live tests