Added datasource test-ds.xml.
Merge origin/master