Make it clear what the intention of resolveCategory is, and cover some missing cases (e.g. acquiring a base category from another base category).

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17431 20353a03-c40f-0410-a6d1-a30d3c3de9de