Simplify start/stop framework logic, I'm getting stop timeouts sometimes

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