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-9135 crlf before mime boundary line should not in file content

When uploading a file, there is a crlf before mime boundary line. The
crlf is added by browser. The existing code reads and copy it as one
part of file content. This fix detects the crlf and does not copy it
into the file content.

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

HPCC-9135 crlf before mime boundary line should not in file content

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-9135 multi-part boundary line check should include extra '-'

When uploading a file, we need to check possible mime boundary line
using the length of mime boundary ID. Browser adds two extra '-'s
in the front of mime boundary ID. If the length of the last line
inside a file content block is less than the length of mime boundary
ID plus two, the last line may still be a mime boundary line separated
by the content block.

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

HPCC-9135 multi-part boundary line check should include extra '-'

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>