QPID-5700: ensure interleaved segments on different tracks do not get confused

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