Merge pull request #1 from JEBailey/master

SLING-7169 consolidate configuration to DefaultGetServlet