QPID-4639: Improve functionality to delete store on virtual host deletion

merged from trunk r1477110


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