Docker complains about the network being already marked as trusted otherwise.
Also an upgrade to docker 20.10 requires manual recreation of the networks and a removal of the docker-proxy network via `firewall-cmd --zone=trusted --remove-interface=docker-proxy`.
With some of the recently introduced changes especially around the
defaults and ipv6 addresses, this patch fixes all remaining issues and
makes sure the docker and firewall configuration fits the expectations.
Original commit: 7819c8fcc8
