Merge pull request #6543 from pferraro/ejb-8.x

[8.x] Backport WFLY-3682 fix to 8.x
[WFLY-3348] Avoid spurious failures
[WFLY-3348] Close the input stream from domain deployment content additions

Conflicts:
	host-controller/src/main/java/org/jboss/as/domain/controller/operations/deployment/DeploymentUploadUtil.java