rpcd: fix missing option removal when merging subsequent uci set calls