TxManager used to commit/rollback transactions
Merge pull request #3295 from lutovich/2.0-lock-release-during-db-shutdown

[2.0] TxManager used to commit/rollback transactions
Consider all possible result types from `CASE`

Rather than finding the leastUpperBound between all the different
expression types, consider them all as equal possibilities.
Merge commit '4d0c1e24d2c660891b656ec25405baf3d33677be' into merge-2.0-to-2.1

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/TopLevelTransaction.java
Merge pull request #3316 from lutovich/merge-2.0-to-2.1

Merge 2.0 to 2.1
Merge remote-tracking branch 'upstream/2.0-maint' into 2.1-maint

Conflicts:
	community/cypher/cypher-compiler-2.1/src/test/scala/org/neo4j/cypher/internal/compiler/v2_1/ast/CaseExpressionTest.scala
	community/cypher/cypher/src/test/scala/org/neo4j/cypher/FunctionsAcceptanceTest.scala
Make sure DbHits and Rows are reported accurately.
Move config for the manual to doctools.
Merge commit '96043202414032c491d3022f816296cbb3e1b064' into merge-2.1-to-master

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/TopLevelTransaction.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TxManager.java
	community/shell/src/test/java/org/neo4j/shell/ShellDocTest.java
Merge pull request #3319 from lutovich/merge-2.1-to-master

Merge 2.1 to master
Follow-up on moving the manual to neo4j.com/docs.
Merge pull request #3313 from systay/apply-profile-bug

Make sure DbHits and Rows are reported accurately.
Merge branch '2.0-maint' into 2.1-maint

Conflicts:
	manual/js/colorize.js
	manual/src/community/help.asciidoc
	packaging/standalone/permalinks.properties
Merge remote-tracking branch 'upstream/2.1-maint'
Merge branch '2.1-maint'

Conflicts:
	manual/common/css/positioning.css
	manual/common/main.js
	manual/conf/disqus-footer.xsl
	manual/conf/footer.xsl
	manual/conf/head.xsl
	manual/conf/webhelp.xsl
Include missing JMX docs.
This also fixes a validation error.
Merge pull request #3318 from nawroth/2.0-extract-docs-config

Move config for the manual to doctools.
Merge pull request #3322 from nawroth/2.1-maint

Move config for the manual to doctools.
Merge pull request #3323 from nawroth/master

Move config for the manual to doctools.
Merge branch '2.0-maint' into 2.1-maint