Two HA commits cherry picked from master

https://github.com/neo4j/neo4j/commit/e9a88b91d0c59627a25f81d0b523ba44cea3890b and https://github.com/neo4j/neo4j/commit/39be5a3a284c8be60cf058482863b7436d09351b

they were authored for master branch, whereas they are applicable to 1.9 as well. Here they are.