PPR and RTR code review mark ups
Merge remote-tracking branch 'origin/master' into tsk2233

Conflicts:
	src/diameterstack.cpp
Change a log to WARN, correct some indentation
Merge pull request #21 from Metaswitch/tsk2233

Reviewer MATT: PPR and RTR code review mark ups