Flavor repair UI does not propose the right XE id when the version is selected

I upgraded from 3.1 to 7.4.4 and the repair UI worked well except that I had to modify the id after selecting 3.1 because it was wrong.

I tough we had some mapping at least for XE ids. The ideal solution is to look at features of the current default flavor and find the one corresponding to 3.1.