Merged refs/pull/5072/head from repository cms-sw
Fix L1 for placeholder HIon/PIon menus