Add manufacturer and model to products schema.

We do not yet use this (only id for matching), but it should be mapped to
the device details, which include these items.

Bulk change to existing configs coming later.

tests/test_device_config.py

@@ -25,6 +25,8 @@ PRODUCT_SCHEMA = vol.Schema(
     {
         vol.Required("id"): str,
         vol.Optional("name"): str,
+        vol.Optional("manufacturer"): str,
+        vol.Optional("model"): str,
     }
 )
 CONDMAP_SCHEMA = vol.Schema(