Fix compilation on Java 6.
Merge branch '1.9-maint' of github.com:neo4j/neo4j into 1.9-maint