SONAR-4326 Fix bad merge in DB migration