Fixed problem with failing audit trail tomcat startup in integration test phase.
Merge remote-tracking branch 'origin/master'