Revert "When messages were being moved to the DLQ they would occasionally get into a bad state.  We now handle the case were a swap out gets canceled much better."
Introduces some regressions.

This reverts commit 3da03ce728687d683a9e12249aa730fafdb5075c.

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