Merge branch 'xtuple' into 19135
merge
issue #19290: be flexible in email inputs
Issue #19288 replace temp url for express testing.
Issue #19288 change include path to work with express.