 [FIX] Fix various problems with r56565 automatic merge where I messed things up trying to manually fix conflicts
 [FIX] Fix various problems with r56565 automatic merge where I messed things up trying to manually fix conflicts

git-svn-id: a7fabbc6a7c54ea5c67cbd16bd322330fd10cc35@56614 b456876b-0849-0410-b77d-98878d47e9d5

oregional/tiki,oregional/tiki,tikiorg/tiki,tikiorg/tiki,tikiorg/tiki,tikiorg/tiki,oregional/tiki,oregional/tiki