Merge pull request #978 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

Firewall - NAT - Port Forward - Edit