PRD-4984, PRD-4985 - Datasource fixes for Kettle DS and data schema