Moes RFIR remote: merge into identical S11 RFIR remote
S11 was previously able to be added when set to scene 1.
Moes was added after product id matching was available to match the no
dps case.
By making all dps optional, both these remotes can match the same
config without the setting to scene 1 workaround.