upgrade spring security
add in latest aspectj
Merge branch 'master' into springSecurityUpgrade
Merge pull request #1710 from ORCID/springSecurityUpgrade

upgrade spring security