Merge "Record "cache" inodes to clear while CE is locked." into nyc-mr1-dev