Merge "Don't return invalid XML from paraminfo when one of parameter values is null"