DATAGRAPH-458 & DATAGRAPH-460 : Spring 4.X compatibility

3.0.x version of PR https://github.com/spring-projects/spring-data-neo4j/pull/174 (which is against the master branch)