Merge "More multi-user fixes on SampleClusterService"