Fix nameserver dependency ordering, puppet-lint fixes