merge in ess upstream #2

Tom-Willemsen merged 4 commits intoISISComputingGroup:masterISISComputingGroup/streaming-data-types:masterfrom

ess-dmsc:masteress-dmsc/streaming-data-types:masterCopy head branch name to clipboard