fix linebreaks in puppet.conf

fix blank linebreaks when not using $puppet_masterport, $puppet_ca_server, $puppet_proxy_host and $puppet_proxy_port