Overwrite chef-server.rb with private-chef.rb if former is empty
Added -p.  Not needed for parent directories, but suppresses error if dir exists.
Merge branch 'dt/fix-upgrade-conflict'