SLING-4058 - improve test isolation, tests pass with Oak now

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