Merge "Implement general upgrade recovery strategies and strict versioning." into gb-ub-photos-denali