Merge common changes to split-3.6

Move the split-3.6 branch to include all changes that have been merged to
both master and candidate-3.6.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge commit '84390ea35e2554909997ce4fff07dd499508b2bf'; commit '6dce881b7a8c54357561b2839e1ba2cf5b85b2b3'; commit '44deb08fd675131b27bd3c3e6ccd26f64b532722'; commit '0dc5401947b500ee80ba58f22c4eff976333871f'; commit '3344334be7e8768ce1a90c247ca7d235165bf557'; commit '66022c35c315f8cf94b1659a13251ae4c0d413ba'; commit 'ae99b52173b32fd3bad46b1bd09eb0bafce0b7cd'; commit 'a3ca274fe97d4352079fd4bbb1b9d4e8717c9d51'; commit '97a275e3598dc78c561aa4b8f5f533c4441d7052'; commit '7f8f956b44ac559eaa920012528b853f9eac0832'; commit '2352b28655d7b1f28d29c20fc84b672f288ebb3b'; commit '8f1b017a8408b50716b6eec20cfcad10d07ce4fb'; commit '75d597cfa1ca60e617478fed7a06321306f2d127'; commit 'd45e055c93d7752c20d32ee602681e4bef3204e7'; commit '2bd201b991dd3b0a0988c6d212f3c956c4874a1f'; commit 'da3690f7ac879886fcb4968c040e432b02f743d4'; commit 'ed285c11ab7e02cec8a663d8338badc004755a81'; commit '4a4217d9b35f27476c826650fb49244cf96c87d0'; commit 'aa5c418feb25629b2bfe2d4ce846a42ae2e50d5c'; commit 'f68d3f368f93dabb2c27c3bee6230d3f1a5bb346'; commit 'ad7391481dfd6ebce0d5d845bfdafecf3e89b320'; commit 'd84db5f720db23def453a4094992763d3d8fbc0d'; commit '46ff27ad48eb4a60d6c3ff6ddd31245640a083ca'; commit 'e2a34c8a137b8747f4b14dcd1fd1180206d3e499'; commit '0055f8a2aaae3b3bc1ad7cedd5f50e524c9afaa4'; commit '9ffbf5c7aca1e0ade2e2ed7535b01ca4a4a222ff'; commit '2db83ee230d1bd5564e2a953fd84c442c2b9fa96'; commit 'c8537db2976f6dd5811870df8b991fa8c8b2f123'; commit '7d9e672d01e618716971f1c6aa5228136021c05e'; commit '1c4b43682dd0c6d7a48546310a41d3a332366a07'; commit '678fabcd5bc67e5c992996f0d3644c41f0cf1faa'; commit '77f044ccae5d2e66800e6d5bc0f0a38b2c4d0872'; commit '54bb70a30fc9d89a030a79512208945cbd2a20f9'; commit '8c60252ca6eabe9c9cb20fe0ffd66031f90ec7e3'; commit 'a1434e763755edb243ad7d9a63eb328e762228ca'; commit '1c306b31bc6efe32a58a95267846dc52c8a4db7e'; commit '41183acf4b5eacf7db4a01d31bee7c8754535ba5'; commit 'fe4dfcbb498ece9cec5c9300c2ec146f21d6ed5e'; commit '201dc8acb8c5a7a8d48098c2f993ac5d7f598540'; commit 'e423ff6e978dd5fc283069663d44eb02349a89bb'; commit 'b25136f8931829cabf988052fdc51081f84fdbc6'; commit '5c5ac6adedfdcb338efccefb8c6458d10a09187b'; commit '4106390d329f317d237884d479a6ddd26d21fa19'; commit '641cc452d10ebe9869cb61b6cecf849b1e026bd0'; commit '53e9135658965e48edce1ffacadfe9ab5cb6cf4d'; commit '884b28c4903fbf7d86629d424f2b897704c1fe8d'; commit 'eb84a8968cdf93ccead619d5516aae5ad7360b68'; commit '2cb0713a4cd46ad43723ab53ab20d2aa69623cd9'; commit '1b43126a934bf45747108194ac56b29733effc38'; commit 'ee70e9234218bdf176c35c76fadc88d158ac8b2b'; commit '83c4afb368d1ad82e17fd4bb29cda2a4453967dc'; commit 'd73901aee29e7327b6e2bc3c76d27b3d3dc62acb'; commit '90f107318582587f33d9d2bff4153c94df317707'; commit 'ed70922493a2414b2656c22b30cf0f2147786cd1'; commit '8d93b531632682f7165d0eeef41d0755f3f00899'; commit 'b7bfd8a9c89297a858cbd52221c9fc1ba7bdc655'; commit '67def1ee3869fc9979d7cdb4f8dfebb7b58471a3'; commit '7dc3d048ee8eb2a92481b03352ea4e36055c5198'; commit 'aa5ba842c1cf599c41bcee9612e8c9d493ecf7d6'; commit '59ee4fd4c8f3428035a111d1749ada550a6aac6e' into split-3.6a
Merge commit '56209' into split-3.6a

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge commit 'd62f4cbfa' into split-3.6a

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
gh-1805 - Child query reading XML dataset failure

When a child query read a xml dataset, Thor failed to create and serialize
the initialization meta information, resulting in a crash in the slave(s)

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge branch 'split-3.6a' into candidate-3.6.x

Make split-3.6a an ancestor (no actual changes merged in)

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'split-3.6a'

Make split-3.6a an ancestor of master. All changes were already in.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1815 from jakesmith/gh-1805

gh-1805 - Child query reading XML dataset failure

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1813 from jakesmith/gh-1805

gh-1805 - Child query reading XML dataset failure

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/split-3.6a' into candidate-3.6.x
Merge remote-tracking branch 'origin/split-3.6a'
Fixed mismerge when bringing split-3.6 up-to-date

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'split-3.6' into candidate-3.6.x
Merge branch 'split-3.6'
Remove CWrappedTransaction

This patch removes CWrappedTransaction and makes removeSubFile
in line with future transaction work (auto-commit). There is also
a small change in how addSubFile works in a transaction, by linking
the file only if it's not in the cache already.
addSubFile with auto-commit feature

Following removeSubFile, addSubFile also has auto-commit
feature, paving the was to refactor swapSubFiles and PromoteSuperFile.
Keep environment persist to disk if external

If the environment was external (loaded from a separate file as pointed to
in the configuration), Dali used to avoid saving this branch to disk.
This changes removes that distinction.
This will be useful, when comparing new environments with old at startup
time.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
gh-1646 - Detect new environment cluster group changes

Use old environment to detect configuration changes.
When constructing cluster groups, either at dali startup, or when a new
environment is loaded, e.g. via updtdalienv, compare old definition with new
and active groups.
The active groups are updated only if the new group definition mismatches the
old environment definition. i.e. no update will occur, if they already match
the active group, or they match the old environment definition.

This means, that a cluster environment change will be reflected when it's
deployed or updated, but prevents rollbacks of the active groups, during an
update or restart if the environment group hasn't changed, but the active
groups have diverged from old environment, e.g. due to swaps.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #1817 from jakesmith/gh-1646

Gh 1646

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/split-3.6' into candidate-3.6.x

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>