https://issues.apache.org/jira/browse/AMQCPP-507

few more fixes and cleanups 

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