SLING-3937 - fixed ITs initialization errors and wrong /var/discovery initialization

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