[merge addon] Add a revertButtons option to turn off revert buttons

Closes #2754