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