'dbinfo' command able to print array values too, and everything comes back as JSON for convenience if used from scripts or similar
(cherry picked from commit dbce7da4e64df793ffa6434a43b59334751bd4f4)

Conflicts:

	shell/src/test/java/org/neo4j/shell/TestApps.java
Doesn't print NOTE if passed a command line, to get a clean result
(cherry picked from commit 84648b6d86be1e4c6895fa56123d67e67fa50503)
Fix for an invalid 'to map threshold' value being passed in
(cherry picked from commit 2814eee6fac2b1f5d7c17dbbc1a49273ff50a463)

Conflicts:

	kernel/src/main/java/org/neo4j/kernel/impl/transaction/ReadOnlyTxManager.java
	kernel/src/main/java/org/neo4j/kernel/impl/transaction/TxManager.java
Backported blob wildcard security rules for server
added rrd to gitignore
added rrd to gitignore
Basic functionality for Index#putIfAbsent
(cherry picked from commit 0dddf2a9839304aa6ad2ab53cee375c57e89f729)

Conflicts:

	kernel/src/main/java/org/neo4j/kernel/impl/core/NodeManager.java
	kernel/src/test/java/org/neo4j/test/OtherThreadExecutor.java
	lucene-index/src/main/java/org/neo4j/index/impl/lucene/LuceneIndex.java
	lucene-index/src/test/java/org/neo4j/index/impl/lucene/TestLuceneIndex.java

Included is also manually copied test classes OtherThreadExecutor/WorkThread to
handle the new test cases.
Added javadocs to places responsible for unique index functionality, and some more tests
(cherry picked from commit 572a03904f784fb27ce96ea66ee7e8aa154b1fe0)

Conflicts:

	lucene-index/src/test/java/org/neo4j/index/impl/lucene/WorkThread.java
Improved the putIfAbsent/getOrCreate API and exposed it in the REST API.
(cherry picked from commit d3302c388236e7dcdc6ef00cba6ff8ff52d9f937)

Conflicts:

	kernel/src/main/java/org/neo4j/kernel/impl/core/NodeManager.java
	lucene-index/src/main/java/org/neo4j/index/impl/lucene/LuceneIndex.java
	lucene-index/src/test/java/org/neo4j/index/impl/lucene/TestLuceneIndex.java
	lucene-index/src/test/java/org/neo4j/index/impl/lucene/WorkThread.java
	server/src/functionaltest/java/org/neo4j/server/rest/IndexNodeFunctionalTest.java
	server/src/functionaltest/java/org/neo4j/server/rest/IndexRelationshipFunctionalTest.java
	server/src/main/java/org/neo4j/server/rest/web/DatabaseActions.java
	server/src/main/java/org/neo4j/server/rest/web/RestfulGraphDatabase.java
	server/src/test/java/org/neo4j/server/rest/web/ModelBuilder.java
	server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java
	shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java
Replaced invalid test for trying to do optimistic unique node creation by relying on a particular implementation detail in Lucene, namely document ids being persistent. Instead added an example of using the UniqueFactory, which also replaced that previous section in the manual
(cherry picked from commit 7db7ad5bcff6709e89afcacc4f83f37da0348058)

Conflicts:

	embedded-examples/src/test/java/org/neo4j/examples/GetOrCreateTest.java
	kernel/src/docs/dev/transactions.txt
Small fixes of typos in Javadocs + fixed some ommissions
(cherry picked from commit 6c33e3eb195e61f027a40c99cf6b86b2cd04094e)

Conflicts:

	server/src/main/java/org/neo4j/server/NeoServerWithEmbeddedWebServer.java
Clearer javadoc for putIfAbsent
(cherry picked from commit 2e099e2633a32c84f6c072c8a7336247fa287d70)
Fixed a small annoyance (a bug that caused SEVERE loggings, but not bad behaviour), and added a few toString() methods.
(cherry picked from commit d4567eb1869a983eeef0cd64579c2dc301fdb014)

Conflicts:

	kernel/src/main/java/org/neo4j/kernel/impl/core/LockReleaser.java
Forgot to merge src/functionaltest
Ignores Eclipse build settings directory
Re-introduced a bug in StartEntry checksum calculation to ensure compatibility with 1.5.2
Abstracted the checksum equality check as a method so that the check can change between versions
Changed tests so that they check the proper bug is in place