Merge commit 'e3fdfb9f8b9bb9ec12ce5d0bd3bc240f48fcfd48' into test-bind

diff --cc manifests/definitions/bind-zone.pp
index 435269843fa0b20d9f40586af58bd0492c51b1c8,6114d9bbfa834e0227c379ece30ba1648f0bae9e..64da5da5486058e2468ed9ad0deb1d28b3cbe0e1
--- 1/manifests/definitions/bind-zone.pp
--- 2/manifests/definitions/bind-zone.pp
+++ b/manifests/definitions/bind-zone.pp
@@@ -71,15 -73,7 +73,16 @@@ define bind::zone($ensure=present
        ensure => $ensure,
        file   => "/etc/bind/pri/${name}.conf",
        content => template("bind/zone-header.erb"),
+       require => Package["bind9"],
      }
 +
 +    file {"/etc/bind/pri/${name}.conf.d":
 +      ensure => directory,
 +      mode   => 0700,
 +      purge  => true,
 +      recurse => true,
 +      backup  => false,
 +      force   => true,
 +    }
    }
  }