QPID-4984: WIP - Merge from trunk r.1534385.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1534394 13f79535-47bb-0310-9956-ffa450edef68
QPID-4984: WIP - Merge from trunk r.1534399.

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