QPID-5700: ensure interleaved segments on different tracks do not get confused, merged from r1587710

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