SLING-2777 - use SlingServlet for some test servlets

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1453854 13f79535-47bb-0310-9956-ffa450edef68