bug: 2176 improvements to database upgrade path