Merge remote-tracking branch 'upstream/1.9-maint' into 2.0-merge-1.9

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/RWLock.java
	community/udc/src/main/java/org/neo4j/ext/udc/UdcSettings.java
	community/udc/src/test/java/org/neo4j/ext/udc/UdcSettingsTest.java
	packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/conf/neo4j.properties
	packaging/standalone/standalone-community/src/main/distribution/text/community/conf/neo4j.properties
	packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/conf/neo4j.properties