Bug#19463867: MAIN.AUDIT_PLUGIN FAILS WITH RESULT CONTENT MISMATCH

Hotfix to address pushbuild failures:

Fix for 12368204 changed logging behaviour, but audit_plugin.test was
updated only with respect to normal protocol, not others such as
--ps-protocol, so it failed in those modes. Hotfix updates the results
expected by the test to match those produced by the server.

Fix for 12368204 added audit_general_log.test which was set up only
with respect to normal mode; hotfix adds support for all other modes,
and aligns expected values with those produced.

This fix addresses the immediate pb failure and updates the "multi
mode deficiency" in the tests/results; any change to the actual code
and behaviour introduced by 12368204 can then happen in that framework.