Quit with an error if cluster_settings or remote_cluster_settings are invalid
Extra cpp-common update
Tabs -> spaces
Apply feedback from reviewer
Rebase to relead-60
Handle bare +sip.instance tokens in Contact headers
Merge pull request #877 from Metaswitch/handle_bare_sipinstance_upstream

Review Andy - Handle bare +sip.instance tokens in Contact headers
Merge pull request #874 from ClearwaterCore/CC_alarms-60

SNMP Alarms Release-60
Pull in latest cpp-common with alarm changes
Handle bare +sip.instance in RegStore
Merge pull request #880 from Metaswitch/handle_bare_sipinstance_upstream_2

Review Andy - Handle bare +sip.instance in RegStore
Generate more alarms in the alarm queue overflow test, to avoid spurious failures if some alarms get processed
Put gmock/gmock.h in the include path for fakezmq
Take latest cpp-common
Merge remote-tracking branch 'msw/dev' into memcached_error_on_no_server

Conflicts:
	sprout/main.cpp
Pass statistics callback correctly
Merge pull request #883 from Metaswitch/clearwater-snmp-handlers-iss26

[No review required] Pass statistics callback correctly
Merge pull request #881 from rkday/fix_alarm_test

Fix minor issues with alarms test code
Merge pull request #810 from rkday/memcached_error_on_no_server

Quit with an error if cluster_settings or remote_cluster_settings are in...
Cope with changed HTtpStack interface