Merge "Cleaned up upgrade steps for versions older than JB"