Merge "[DCAEGEN2] Update datafile-app-server to 1.6.0"