--code cleanup for CRM-11986
--fixed for CRM-11467
--fixed for CRM-11983
Merge pull request #41 from pradpnayak/CRM-11467

--fixed for CRM-11467
Merge pull request #42 from pradpnayak/CRM-11983

--fixed for CRM-11983
Merge pull request #43 from pradpnayak/webtest

--code cleanup for CRM-11986