Merge pull request #994 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

VPN - OpenVPN - Client Specific Overrides