This change landed in master, but needs backporting to mitaka (and probably liberty) to simplify upgrade.
This change landed in master, but needs backporting to mitaka (and probably liberty) to simplify upgrade.