Merge "Error logging in SO-SDC adapter - in case of service distribution without...