Merge pull request #1013 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

Services - DNS Forwarder