FELIX-4287 fix NPE when dispose called after bundle stopped, simplify deactivate method calls

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