Backport neo4j-desktop to 1.9
Merge branch '1.9-desktop-backport' of github.com:boggle/neo4j into 1.9-maint