Merge branch 'dryad-master' into integration
Add integrated configuration for ECOLETS
Add test configuration for Scientific Data
Merge branch 'dryad-master' into dryad-dev