VFS-1172, merge with develop
VFS-1172, merge with develop

onedata/web-client,onedata/web-client,onedata/op-worker,onedata/op-worker,lopiola/gui,onedata/cluster-worker,onedata/oz-worker,onedata/oz-worker,onedata/op-worker,onedata/oz-worker,onedata/cluster-worker