PPR and RTR code review mark ups
Final mark ups for PPR and RTR (and up to date cpp-common)
Resolve merge conflicts
Fix all build breakages caused by blurgh with cpp-common
Merge pull request #15 from Metaswitch/tsk2233

Review MATT: PPR and RTR code review mark ups