Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev