Merge pull request #580 from jbonofre/AMQ-8075

[AMQ-8075] Upgrade to xbean 4.18