Merge "Fix and disable cloud-servicechain config"