MswRollUp: Ert : Fix of missing MSW branches
This is an intermediate commit and does not compile
p4#: 22228