fix build breaker - adjust XML snippet processed by xml2cmp tool and adjust xml2cmp tool to handle XML comments
