I did it this way.
1. Excluded the devices by holding the button on the gen5 stick to enter exclude mode - then clicking the fibaro 3 times
2. Included the device to the new stick as normal
3. Inserted the gen5 stick in my Indigo server and mapping all devices inside Indigo by using "define and sync"
I didn't do anything with the old stick. Just removed it.
Just one "warning" - this method deleted all associations and zwave parameters on the devices. I had to re-enter all config parameters for my fibaro's
Parameters like "auto off" - toggle or bi-stable" etc...