NOJIRA: Added a log4j file for testing purposes in order to fully diagnose test failures
Merge branch 'master' of github.com:Jasig/cas