CLC-1210 Refactoring per Ray's suggestion to make CalLink and Sakai proxies more like the others; collapse SakaiCategorized into SakaiProxy