Start of bug 24650 Fix API to work with categorylinks changes