Various fixes to support RTR and PPR handling
Merge pull request #14 from Metaswitch/ppr-rtr-support

[Reviewer Graeme] Various fixes to support RTR and PPR handling