Make Firewall Rules Advanced Options open if used - 2.1 branch

This is the same code as pull request 997 but for 2.1 branch