XCOMMONS-682: Upgrade to Aspectj 1.8.4