Update notes for submitted changes

* Add compatibility code with mainline's configuration options for unlock