Merge "Add 2way sync for salt-formulas/auditd"