Refactor stats so they do not pull in variables from sprout
Take latest cpp-common
Stats tool changes
Stopwatch tests
Experimental time control changes
Merge remote-tracking branch 'origin/master' into stats_refactor
Make stopwatch tests completely control time
Take latest cpp-common, and delete the sprout test interposer
Temporarily back out stats script changes
Add script for sending OPTIONS polls over SIP
Markups
Merge pull request #367 from Metaswitch/stats_refactor

[Reviewer: Matt][From: Alex] Sprout changes following cpp-common stats refactor.
Fix command-line parsing.
Merge pull request #368 from Metaswitch/poll-sip

[Reviewer: Ben] Add script for sending OPTIONS polls over SIP
Take latest HTPP stack
Merge pull request #369 from Metaswitch/take_latest_http_stack

[No review required] Take latest HTTP stack
Remove http connection
Merge pull request #370 from Metaswitch/httpcon

[No reviewer] Remove http connection
Merge branch 'master' of github.com:Metaswitch/sprout into sto625

Conflicts:
	sprout/Makefile
Merge branch 'dev' of github.com:Metaswitch/sprout into sto625