Merge "Implement a more capable servlet auditing interface."