Merge "Replace deprecated ObjectCache and CommentStore calls in filerepo"