The bad news: I now have to spend a couple of hours getting all the old apps reloaded and configured...
However - looks good so far.

Dschink: this wasn't an OTA upgrade for some reason, so it was a wipe & reload job