Merge pull request #1009 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

Diagnostics - Packet Capture