Add message on cancel in SI if C-Form exists, Add validation in C-Form, remove update_c_form
Merge pull request #2173 from ankitjavalkarwork/fix2043

Add message on cancel in SI if C-Form exists, fix minor error, Add validation in C-Form
Merge pull request #2193 from anandpdoshi/anand-september-15

Recurring fix, cherry-picked nabin's address template fix
[minor] removed Suggest