Fixing NPE in dataGrid helper
Merge branch 'fix' of https://git.soma.salesforce.com/emoses/aura into jye/master-pending-emosesfix-datagridhelperNPE
Merging origin/jye/master-pending-emosesfix-datagridhelperNPE into master