mb-9506. Upgrade path changes for 2.0, 2.1, 2.2