QPID-4390: misc cleanup


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454942 13f79535-47bb-0310-9956-ffa450edef68
QPID-4596: remove manipulation of store files, and vhost store type etc.


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