Merge pull request #5752 from ghalliday/issue11280

HPCC-11280 Fix clang compile error (and invalid code)

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5743 from xwang2713/HPCC_11113_public_key_permission

HPCC-11113 Set public key permission to 600

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5613 from jakesmith/hpcc-11114

HPCC-11114 - Missing user credentials from foreign sub files

Reviewed-By: Russ Whitehead <william.whitehead@lexisnexis.com>
Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11280 Fix trivial clang warning about nested comments

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

HPCC-11280 Fix trivial clang warning about nested comments

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5722 from garonsky/HPCC-11254_remove_sortabletable.js

HPCC-11254 ConfigMgr - Remove references to sortabletable.js

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10770 - Allow SuperOwner to be changed  wilst file read

Add independent locking mechanism for SuperOwner, so that it can
be protected and manipulated whislt files are being read.
Refactor some of the very similar locking code used to lock
files the attributes of files and this new SuperOwner lock.
Also use a new branch independent of the file itself for the
new SuperOwner locks, which as a side-effect will also make
them fast to access, i.e. rather than walking a long scoped
file path to get to lock.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
HPCC-10770 - updates following review

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #5654 from wangkx/h11165

HPCC-11165 Default to roxie on Package Map pages

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11288 - regression if inside transaction

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #5295 from xwang2713/hpcc_ming

JIRA HPCC-10637 Add Charm support

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10982 Edits based on code review

Signed-off-by: JamesDeFabia <James.Defabia@LexisNexis.com>
Merge pull request #5740 from wangkx/h11233

HPCC-11233 Remove sortableTable.js and related code in xslt files

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-10289 Edits based upon code review

Signed-off-by: JamesDeFabia <James.Defabia@LexisNexis.com>
Merge pull request #5742 from GordonSmith/HPCC-10759

HPCC-10759 Warn user of imminent password expiration

Reviewed-By: Kevin Wang <kevin.wang@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5747 from JamesDeFabia/10289_jsonpDocs

HPCC-10289 Document JSONP support

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5746 from JamesDeFabia/10982_DaliIp_Packages

HPCC-10982 Add daliIP and sourcecluster to packagemap docs

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5732 from jakesmith/hpcc-10770

HPCC-10770 - Allow SuperOwner to be changed  wilst file read

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/closedown-4.2.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #5737 from ghalliday/issue9792b

HPCC-9792 Improve the error message on invalid use of STEPPED

Reviewed-By: Jamie Noss <james.noss@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>