Support for per-user .vmoptions in Neo4j Desktop
Make JettyLoggerAdapter handle string formatting errors
Merge remote-tracking branch 'upstream/1.9-maint'
Merge branch '2.0-vmoptions'

Conflicts:
	packaging/neo4j-desktop/neo4j-desktop.install4j
	packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/ui/DesktopModel.java