Quit with an error if cluster_settings or remote_cluster_settings are invalid
Extra cpp-common update
Tabs -> spaces
Apply feedback from reviewer
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
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...
Take latest memento
String representation of IPPROTO_TCP is not 'UDP'
Merge pull request #885 from rkday/fix_transport_string

String representation of IPPROTO_TCP is not 'UDP'
Handle bare '+sip.instance' in ACR code
Merge pull request #886 from Metaswitch/handle_bare_sipinstance_upstream_3

Reviewer Andy - Handle bare '+sip.instance' in ACR code
Merge remote-tracking branch 'origin/master' into http_flows_in_sas