[bp/r????][FIX] A couple more missed merges from 9.x - better handling for categorypath_excluded pref array and a missing include
[bp/r????][FIX] A couple more missed merges from 9.x - better handling for categorypath_excluded pref array and a missing include


git-svn-id: af5bb48fb2a0cb60e67452268cc916e057dff245@43831 b456876b-0849-0410-b77d-98878d47e9d5

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