FELIX-3680 fix test so it is might pass, and add shutdown logic

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