fixes #2520 - defines default settings for dns and puppet
(cherry picked from commit c4a245d514b1ce6de6c3c79a3e458e52caa4dc7e)
Release 1.2.0-RC2