Merge remote-tracking branch 'XTUPLE/4_4_x'
Merge branch 'master' of github.com:andersdd/xtuple
Merge remote-tracking branch 'XTUPLE/4_5_x'
Merge remote-tracking branch 'XTUPLE/4_6_x'
Rename activityList to avoid strict naming conflict
Merge pull request #1526 from andersdd/fix_activitylist

Fix activitylist naming convention
Merge branch '4_6_x' into 21048