FELIX-4293 slight refactoring of use of config admin to make control flow more obvious, and fix mistake introduced in FELIX-3651 rev 1480108

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1535941 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/changelog.txt b/scr/changelog.txt
index 4e9fe46..0a08b0c 100644
--- a/scr/changelog.txt
+++ b/scr/changelog.txt
@@ -44,6 +44,7 @@
     * [FELIX-4224] - [DS] Dependency manager can be active but not have m_bindMethods set
     * [FELIX-4287] - [DS] NPE when calling ComponentInstance.dispose after bundle shut down
     * [FELIX-4290] - [DS] Issue with factory components with required configuration
+    * [FELIX-4293] - [DS] logic error in handling configuration LOCATION_CHANGED event
 
 ** Task
     * [FELIX-3584] - [DS] Handle new LOCATION_CHANGED event