fix for: https://issues.apache.org/jira/browse/AMQCPP-487
fix and test for: https://issues.apache.org/jira/browse/AMQCPP-488

git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-cpp/branches/3.7.x@1491601 13f79535-47bb-0310-9956-ffa450edef68