additional changes for the picketlink upgrade, specifically for tomcat 7 support
Merge pull request #64 from EricWittmann/SRAMP-411

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