Merge commit '71aa3ed67d7d7bac1bf5b0a95a83dd84b3afb40a' into 2.2

Conflicts:
	community/browser/app/scripts/directives/neoTable.coffee
	community/browser/test/spec/directives/neoTable.coffee
Merge commit '23efad96e074ea4d590b15eb16aa38c3f9daec5c' into 2.2

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/PropertyContainerLocker.java
Merge: Docs fixes around mvn, tx, config, shell.

Merges commit 'd0cb03728299dfd2641cf29779f5bc59376422cb' into 2.2,
via commit '67875d301dc1a51ec61cc8d04bde6813a743a650'.

Conflicts:
	community/kernel/src/docs/ops/jvm.asciidoc
Changed default compiler/planner to cost/ronja
Merge pull request #3047 from thobe/2.2-merge-2.1

Merge 2.1 into 2.2
Merge pull request #3044 from benbc/2.2-test-artifact-cleanup

2.2 test artifact cleanup
Merge pull request #3033 from pontusmelke/change-default-compiler

Changed default compiler/planner to cost/ronja
Add semantic checking to unique constraints in AST

This avoids the unnecessary creation of an additional legacy query tree
for every statement.
Merge pull request #3032 from systay/warnings

Fix some compiler warnings, mostly in Cypher
Merge pull request #3031 from systay/profile-shell

Fix broken PROFILE in Cypher
Change dest to 'fonts'.
Merge pull request #3048 from cleishm/no-legacy-verify

Add semantic checking to unique constraints in AST
Merged 2.1-maint into master
Merge pull request #3049 from cleishm/master-merge-2.1

(2.2)<-[merge]-(2.1)
Merge pull request #3002 from lutovich/2.1-prettier-exception-in-backup

Prettier exception when backup target is different store
Remove artifacts from merge
Prints only start of invalid lock result buffer in case of failure

introduces HexPrinter utility for this neat printing.
Throws plain DeadlockDetectedException during commit

instead of TransactionFailureException. A recent change in timing when
records where changed in a transaction (from the point of the change, to
the point where the transaction committed) had some deadlock exceptions
converted into TransactionFailureException instead. This commit changes
that back so that the transaction surface looks the same in that sense.
Fixes a test blemish
Add rewriters for normalizing WITH and RETURN