typo
update doc for yaml format for null

I found that ~ is used for null instead of -
Merge remote-tracking branch 'origin/2.0' into 2.0
Fix upload code
[#2454] Manually adding changes that wouldn't patch cleanly to 2.0