Perform the merge live

[lmas]

Done live with the whole group as an exercise in pulling hair from the head.

Depends on:

• Merge in tests from Comfortstat #58
• Merge in tests from Zigbeevalve #59

Tasks:

• Verify PR statues
• Merge comfortstat
• Merge zigbee
• Merge workflow
• Handle conflicts
• Inspect linters/tests
• Tag new version

[lmas]

All done in 7h x 1 head. Probably more time spent from @Pake-TU and @SimonPergel. Please add your own times to the total.

Edit:
@Pake-TU adds 6h.