Feature #1776 (allow users to add an hostname/overwrite 'discovered' ip addresses)
Fix for Bug #1773 (no failover support for shared-networks in DHCP)
Fix for bug #1772 (4th hextet isn't visible in add_host.html when all zeroes)
Feature #1774 (Add strategy config for SUBNET_AUTO_RESERVE => SUBNET_AUTO_RESERVE_STRATEGY)
Feature #1747 (config option to disable 'discovered' ipblocks on IPv6 subnets)
Merge remote-tracking branch 'upstream/master'