XCOMMONS-465: Upgrade to AspectJ 1.7.4 and AspectJ Maven Plugin 1.5
Merge branch 'master' into feature-upgradeaspectj
XCOMMONS-465: Upgrade to AspectJ 1.7.4 and AspectJ Maven Plugin 1.5