Replace all menu I paths by menu II paths
remove comments
Merge pull request #4449 from ebouvier/FirstMenuRunII

Replace all menu I paths by menu II paths