Mock and datagrid now use 'keys' as an object. Extra feature: 'feature' is now not displayed on the datagrid.
some cleanup for mock-extension.
Resolve merge conflict.
Add key for fake datasource.
Merge pull request #312 from ozone-development/enhancement/304/datagridKeys

enhancement/304/datagridKeys