Merge pull request #113 from LAshokReddy556/obsplatform-2.03

removing NationalId
nationalId to clientconfiguration datas
Merge remote-tracking branch 'upstream/obsplatform-2.03' into obsplatform-2.03
Merge pull request #115 from Rakeshadlagatta/obsplatform-2.03

NationalId added to file
sortBy changes
Merge pull request #118 from Rakeshadlagatta/obsplatform-2.03

sortBy changes