CRM-12964-upgrade-handling
Merge pull request #1140 from pratik-joshi/CRM-12964-upgrade-handling

CRM-12964-upgrade-handling