QPID-5715: Fix various issues with configuration upgrader to model 2 and store upgraders to version 8

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