Updated aspectj and aspectj-maven-plugin dependencies.
Merge branch 'master' into sso