Merging Audit and Honor Enrollment Modes

The audit and honor enrollment modes are now combined into honor.

@dsjen @rocha