Don't YAML'ify empty strings to `None`
Merge pull request #11622 from s0undt3ch/develop

Don't YAML'ify empty strings to `None`