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