Merge remote-tracking branch 'origin/candidate-3.10.x'

Conflicts:
	esp/files/ECLPlayground.css
	esp/files/scripts/ESPResult.js
	esp/files/scripts/ResultsControl.js

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8152 Display Compress option for Spray XML

dfuplus offers a compress=1 option that works when spraying XML
files. ECLWatch should provide this option also. The existing
code only displays the option when sprayfixed or sprayCSV. This
fix displays the option for all types of file spray.

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
Merge pull request #3636 from jakesmith/csvheadingopt-bug

HPCC-8216 Csvread,opt heading crash

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Community Edition Release 3.8.6-7

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8052 nested ChildDatasets + ECL Playground generated results

Added IE7/8 Fix
Encode special chars for nested table view.
Vertically align text to the top.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Merge pull request #3623 from GordonSmith/HPCC-8052

HPCC-8052 nested ChildDatasets + ECL Playground generated results

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8221 ESP wasn't correctly loading plugin definitions

Due to a change in the way scopes are loaded on demand, esp wasn't correctly
picking up symbols defined in plugins because they were still waiting to be
loaded.

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #3639 from ghalliday/issue8221

HPCC-8221 ESP wasn't correctly loading plugin definitions

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3632 from jakesmith/daliadmin-unlockusage

HPCC-3091 daliadmin unlock usage misleading

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3633 from wangkx/h8136

HPCC-8136 Remove Auto-refresh function for Target Clusters page

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-7944 Add setting, to allow master memory to be specified

Also fixes a bug, that if globalMemorySize was left blank
and slavesPerNode was >1, it would limit master memory to the
same calculated memory as each slave
(which is 75% physical / slavesPerNode)

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #3626 from ghalliday/issue3192

HPCC-3192 change fileServices spray functions to pass on maxConnections

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3587 from ghalliday/issue2558

HPCC-2558 Fix problems deleting workunit .so/.cpp files

Reviewed-By: Renato Golin <rengolin@hpccsystems.com>
Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-7980 Translate remote file dafilesrv access to local

Add a mechanism to spot remote file access that matches a/some
subnets and translate them to local file access.

This is allow separate slaves/nodes to circumvent the use
of dafilesrv access remotely on other nodes, when the FS is always
remote, e.g. a NAS fs attached to all nodes

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge branch 'dafilesrv-nas' into candidate-3.10.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8034 Add example of grouped hash dedup to the regression suite

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge branch 'issue8034' into candidate-3.10.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8212 Implement grouped hash dedup for hthor and roxie

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge branch 'issue8212' into candidate-3.10.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #3640 from jakesmith/mastermem-3.8.6

HPCC-7944 Add setting, to allow master memory to be specified

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>