SHIRO-316: applied patch.  Due to patch's age, I did not use the patch's AspectJ version 1.6.7 since the project is already using a later stable version (1.6.12).  Also upgraded the aspectj-maven-plugin from 1.3 to 1.4

git-svn-id: https://svn.apache.org/repos/asf/shiro/trunk@1479184 13f79535-47bb-0310-9956-ffa450edef68