[master] kea-dhcp4 config merge now merges globals

    Merge branch '402-merge-dhcpv4-global-parameters-fetched-from-the-cb-into-the-configuration'

diff --cc src/bin/dhcp4/json_config_parser.h
Simple merge

diff --cc src/lib/dhcpsrv/srv_config.h
Simple merge