Audit log,resolved merge conflict

Audit log code merge conflict resolved

Issue-ID: PORTAL-941
Change-Id: I1dbe87cee9b471aa0b7319bd8a568826de927c8b
Signed-off-by: jz385p <jegadeesh.babu@att.com>
7 files changed