CRM-12854 fix
Merge pull request #1033 from pratik-joshi/CRM-12854

CRM-12854 fix
CRM-12852 fix
Merge pull request #1038 from pratik-joshi/CRM-12852

CRM-12852 fix
CRM-12870 fix
Merge pull request #1042 from pratik-joshi/CRM-12870

CRM-12870 fix
CRM-12804 fix : add any missing settings at the end of final upgrade
Fix img name CRM-12670
Merge pull request #1045 from pratik-joshi/CRM-12804

CRM-12804 fix : add any missing settings at the end of final upgrade