Openhab unstable after upgrade to 2.5

Zigbee and Z-Wave manual install script has a script to do it all for you.

You definitely need to delete and recreate your Zwave Things when upgrading from 2.4 to 2.5.