HELP-5341: preserve rule order
HELP-5338: support networks where the hostname differs from the nodename