https://issues.jboss.org/browse/JBPAPP-10985 - duplicate deliveries and negative counters

Fix and test commits are separated to make it easier for QA to validate the issue