Merge pull request #1581 from xtuple/4_5_x

4 5 x
Merge remote-tracking branch 'upstream/4_6_x' into server-npm-integration