SLING-693 Ensure the "org.apache.sling.api.include.servlet" and "org.apache.sling.api.include.resource" request attributes are correctly set