Merge "Using upgrade.old_release in nova.upgrade.pre state" into release/2019.2.0