CHG0081702 – Remove unused firewall configuration objects and make small adjustments to current config