Merge branch 'dev' into fakelogger

Conflicts:
	sprout/ut/hssconnection_test.cpp
Take latest cpp-common fakelogger