remove "name" and "env" from datasource.json
Merge branch 'refs/heads/develop'