Merge pull request #419 from Metaswitch/curl_fixes

[No review required] cURL fixes
Merge pull request #420 from Metaswitch/curl_fixes

[Reviewer: Ellie] Enhance fakecurl to cope with the resetting of cURL options
Add header name
Send different responses depending on http code
Fix module update
Add custom header type and related functions
Unit test utility functions
Merge pull request #421 from Metaswitch/iss286

[Reviewer: Rob] Iss286
Set Session-Expiry to configured value
Fix up UT infrastructure
Add UT of header addition
Add init.d function
Markups
Merge pull request #423 from Metaswitch/session-expires

Reviewer Mike - Session expires
Merge remote-tracking branch 'origin/dev' into homestead_registration

Conflicts:
	sprout/registrar.cpp
	sprout/ut/fakehssconnection.hpp
	sprout/ut/registrar_test.cpp
Fix failing UT thanks to mis-markup
Merge pull request #424 from Metaswitch/session-expires

No review required - Fix failing UT thanks to mis-markup
Merge remote-tracking branch 'origin/dev' into homestead_registration
Fix remaining merge conflict