FELIX-3727 wait for actor to finish, and also avoid NPE

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