Merge branch 'noc-http-resolution-err' into 'master'

DataStream client: Handle DCS ResolutionError properly

See merge request !2832

(cherry picked from commit dd45fcd8)

c53e8e21 DataStream client: Handle DCS ResolutionError properly