QPID-5813: merge license and empty file changes from trunk rr1617774 and 1618218

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