SLING-4103 : Potential NPE when services get restarted

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