Merge "Remove extra noop.yaml ports from network-isolation files." into stable/pike