XHTML Compliance

UPnP & NAT-PMP
Merge pull request #950 from N0YB/RELENG_2_1

XHTML Compliance