Merge "Refactoring PayloadLoggingServletFilter"