XCOMMONS-615: Upgrade to AspectJ 1.8.2 and AspectJ Maven Plugin 1.7