Merge pull request #1006 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

VPN - PPPOE