Backport neo4j-desktop to 1.9, part 2