LT-13570, Make FixFwData handle custom lists with same name

Change-Id: I658baf10a0d3c3f8025960a60b2e8cf8eb9b9643