XCOMMONS-677: Upgrade to Maven Assembly plugin 2.5