Adding nntpproxy.conf and fixes after merge from upstream/master