Merge "Remove not-working all-in-one upgrade environment"