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