Properly wait for task termination (if any), this allow a more synchronous shutdown

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