QPID-4984: Fix for recovery ambiguity issue, other code tidy-ups

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