[IOControllerComponentTest] current;
Merge branch 'feature/core' of github.com:webvariants/susi into feature/core

Conflicts:
	Core/test/auth/AuthControllerComponentTest.cpp