Merge pull request #2 from yashodha/mywork-CRM-12274

worked on upgrade part CRM-12274
reminder fixes for CRM-12274