Merge "Use ServerOsCollectConfigData value in output"