Suggesting re-enable https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/13/html/fast_forward_upgrades/assembly-preparing_for_openstack-platform_upgrade#annotations:f415147c-26a5-4064-8096-40934a89be36
Updated and merged for OSP13 Queens. Also closed BZ1657505 as part of this BZ.
*** Bug 1657505 has been marked as a duplicate of this bug. ***