Improve upgrade messages CRM-12369