Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8888 Rename Spray CSV to Spray Delimited in EclWatch display

The existing Spray CSV menu item may be used for spraying a variable
length file with fields separated by delimiters, including CSV file.
This fix renames the Spray CSV menu item to Spray Delimited. It
renames several display items related to the Spray CSV function, such
as CsvSeparate, CsvEscape, etc. Those items are displayed on DFU WU
Details page and Logical File Details page. This fix does NOT rename
CSV related variables inside HTTP/SOAP requests/responses.

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
Merge pull request #4252 from wangkx/h8888a

HPCC-8888 Change 'Spray Variable' to 'Spray Delimited'

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/closedown-4.0.x' into candidate-4.0.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>