Merge pull request #1520 from xtuple/4_5_x

4 5 x
accommodate corner case in smoke test
Merge pull request #1523 from shackbarth/wotest

accommodate corner case in smoke test
Merge remote-tracking branch 'XTUPLE/master'