NO-JIRA: merge empty dir removals from trunk r1618200,1618231,1618236

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620832 13f79535-47bb-0310-9956-ffa450edef68
NO-JIRA: remove straggling empty dir from qmf2 tools

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