Additional changes for the picketlink version upgrade, specifically for tomcat 7

https://issues.jboss.org/browse/SRAMP-411