Merge "Add auditd upgrate steps" into stable/ocata