Merge pull request #647 from shackbarth/20902-itemsite140

20902: fix itemsite bugs
fix itemsite bug
Merge pull request #663 from shackbarth/charfix

fix itemsite bug on characteristics
Merge remote-tracking branch 'xtuple/master'