Fix #1270533 [Rename Orizon plugin to Cybook Orizon](https://bugs.launchpad.net/calibre/+bug/1270533)
Ensure that neighboring changes of the same kind are merged