Improve description of data integrity in manual
Merge pull request #2942 from cleishm/data-integrity-docs

Improve description of data integrity in manual
Set node caption to first attribute if no style.

If no grass style that match a node with
attributes specifies which caption to use,
the first one from the attribute list will be
chosen. If no attributes, db id it is.
Remove variable check that's always true.
Test case for race with commit updating the cache.

When a transaction commits, it will update nodes in the (object) cache
to add relationships to them that were created by the transaction. It is
however possible that the node was not in cache when the transaction
started its commit process, but was put into the cache by another thread
reading the relationships of that node. If this other thread read the
relationships after the committing transaction had written them to the
store, but before it updated the cache, the reading thread would have
already read the relationships that the committing transaction is about
to add into the cache. If that happens, the committing transaction will
still add these relationships, but now they will be in the cache twice
for that node.
Fix for race with commit updating the cache.

Extends the range of the locks acquired while writing to the store, to a
greater region including the place where we update the cache. Also make
sure we acquire corresponding read locks when attempting to read
relationships into the cache for a node.

This should be deadlock free because reader threads only ever acquire
a lock for one node at a time, and release it immediately after updating
that node. And while the writer thread acquires multiple locks, we only
ever have one writer thread acquiring locks at any given time.
Merge pull request #2977 from thobe/2.0-cache-race-commit-and-read

[2.0] Fixes race between reading into cache and commit updating the cache
Merge branch '2.0-maint' into '2.1-maint'.

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeImpl.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeManager.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/NeoStoreTransaction.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLog.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaResourceManager.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestNeoStore.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/xa/NeoStoreTransactionTest.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/DummyXaDataSource.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TestCacheUpdateDeadlock.java
Update upgrade and backup documentation
Merge pull request #2984 from cleishm/upgrade-docs

Update upgrade and backup documentation
Tagging for version 2.1.4
Reduced dataset size for 19 migration test
Back to development version.
Moves version in poms to 2.1.5-SNAPSHOT
Merge pull request #2990 from lutovich/2.1-smaller_dataset_for_19_migration_test

Reduced dataset size for 19 migration test
More accurate documentation for shell configuration.
No leftover dirs during upgrade
Fix formatting of configuration file names in the documentation.

This change methodically fixes all references to neo4j.properties and
neo4j-server.properties to the correct formatting. Also changes any
other file names that were nearby.
[2.1] Print logs from flaky test shouldUpgradeDatabase().
Merge pull request #2995 from benbc/2.1-docs-filename-format

Minor docs improvements