issue #20073: Fix customer shipto problems. issue #19813: Fix customer group model problems.
Merge pull request #284 from jrogelstad/master

issue #20073 and #19813: Bug fixes.