Cleaning up from the upgrade to the new Maven Bundle Plugin