Make sure pj_thread_desc passed to pj_thread_register is valid for lifetime of thread
Fix compiler warning
initial astyle changes
revert spacing changes around switch statements
Check AS URI in filter criteria
Add UTs for P-V-N-I header
Insert P-V-N-I header into REGISTERs coming through Bono
Add warning if the I-CSCF doesn't get a PVNI
P-Visited-Network-Id -> P-Visited-Network-ID (the RFC 3455 capitalisation)
Code review feedback
Merge pull request #797 from Metaswitch/sto940

[No reviewer required] sto940 code review feedback
Merge branch 'dev' of github.com:Metaswitch/sprout into issue472
Update memento as build
Check server name URI in IFC
Pull in correct file
Merge pull request #798 from Metaswitch/issue472

{Reviewer Andy] Check URI returned in IFC
Merge pull request #799 from Metaswitch/libmemento_changes

[Reviewer: Mike] Libmemento changes
Use a --option=value format to better catch missing command-line arguments
Make poll_restund only tight-loop for 1s, not forever
Merge branch 'dev' of github.com:jmmL/sprout into jmml-dev

Conflicts:
	sprout/main.cpp