Merge pull request #1007 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

VPN - PPTP - Configuration
XHTML Compliance

VPN - PPTP - Users