Fixed upgrading from 1.14 images.

There is no OCD run, since we don't have automatic testing of upgrade. Tested the upgrade manually.