Add Zigbee2Mqtt ID to device configuration

I made the corrections and rebased the PR to be up to date.
However, there is an error with the Cypress tests
image
image

Probably a flaky test, I reran the tests!

Thanks for the fixes!