CLSN-1475 Added property name in stack Trace
Merge branch 'icici' of https://github.com/algosystech/collosys into icici

Conflicts:
	UserInterface/Developer/generatedb/ExcelData/FileColumn.xlsx