QPID-3401 Checking the proposed changes into a branch to preserve history & continue working until such time it's accepted into trunk.