Merge "Fix -p option failing in set-values-from-xml command"