SONAR-5233 Fix potential resource key conflict during 4.2 migration