automerge: 8be3724 * commit '8be3724a06f7b2d28c6664ca11a03f91f97f0972': Remove references to persist.sys.language/country.