QPID-5035: Revert change 1510657, which incorrectly altered the config precedence

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