Adjust key schema: merge mode into key, move rules from key.* to key.rule.*, adjust related function names.
Adjust key schema: merge mode into key, move rules from key.* to key.rule.*, adjust related function names.

danny0838/firefox-scrapbook,danny0838/firefox-scrapbook