v7.0.0-ICANN1

Full Changelog: v2.7.0-ICANN...v7.0.0-ICANN1

custom_server_conf order

Change the order on which the custom_server_conf is included into the unbound.conf.erb . In some cases the custom_server_config could need to be after the stub zones data that is concat into the unbound.conf.

v2.7.0-ICANN

Pull upstream release

1.1.6-ICANN-3

resolve conflict

fix copy paste issue

1.1.6-ICANN-2

resolve conflict

1.1.6-ICANN: Merge pull request #4 from icann-dns/freebsd_10

add support for freebsd 10

1.0.0-ICANN: Move trust anchor file to a directory owned by unbound so it can be

updated.  Also initiate the file using unbound-anchor instead of using a
hard coded DS record.