WIP commit before leaving branch
Add sprout-libs-dbg package, containing debug symbols for sprout-libs
Fix everything up so it compiles
Merge branch 'dev' into homestead_registration

Conflicts:
	sprout/registrar.cpp
WIP commit
Create a separate poll-sip-bono and poll-sip-sprout to allow side-by-side installs
Revert "Create a separate poll-sip-bono and poll-sip-sprout to allow side-by-side installs"

This reverts commit d814a41062fa7850e300de0db6ea319cde735776.
Move poll-sip script into clearwater-infrastructure
Merge pull request #410 from Metaswitch/separate_poll_sip

[Reviewer: Matt] Create a separate poll-sip-bono and poll-sip-sprout to allow side-by-sid...
Add UTs to check behavior when there are no SPTs below a TriggerPoint in IFCs
Merge branch 'no_spt_ut' into dev
All UTs (except corrupt edge tokens) now passing
Fix spurious TestEdgeCorruptToken failure
Code coverage fixes
Minor cleanup
Use PUT rather than GET
Merge remote-tracking branch 'origin/dev' into homestead_registration
Merge pull request #409 from Metaswitch/sprout-libs-dbg

[Reviewer: Rob] Add sprout-libs-dbg package, containing debug symbols for sprout-libs
Corrections to deregistration behaviour
Fix restund to support IPv6