QPID-5996 : temporarily revert due to failures with external tools

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