Look at the attached movie.

I select items, so that the last selected item (and focus) is on the item, which I collapse. As a result, item is collapsed, but focus jumps up on 2 positions.

Affected tests:
ControlsAutomatedTestSuite/javafx/scene/control/test/treeview/TreeViewTest/selectionCorrectnessOnCollapsing3Test