Merge remote-tracking branch 'qivicon.smarthome/xml-processing-contribution-final' into config-discovery-dev

Signed-off-by: Alex Tugarev <telekom@tugarev.de>
Fixed error after merge

Signed-off-by: Alex Tugarev <telekom@tugarev.de>
Merge remote-tracking branch 'qivicon.smarthome/config-discovery-dev' into integration

Signed-off-by: Alex Tugarev <telekom@tugarev.de>