JCR-2263: Content is visible twice in CLV and Versions (Part 2)