QPID-5048: restore some config that was erroneously removed previously, update to match current build

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