Request for inclusion in 0.30

[Robbie Gemmell]

License header fixes coming from the beta, commits:
https://svn.apache.org/r1618218
https://svn.apache.org/r1617774

via https://issues.apache.org/jira/browse/QPID-5813

Robbie