Merge pull request #660 from jbonofre/AMQ-8281

[AMQ-8281] Upgrade to xbean 4.20