SONAR-5389 Fix some issues with analyzer -> sensor compatibility mode