Fixed build errors after merge.
Changed non-Docker master.conf sample file to use IP addresses again.