Fixes #535 - "INTERNAL_SORT" columns show when doing RETURN * ORDER BY
Merge pull request #537 from systay/535

Fixes #535 - "INTERNAL_SORT" columns show when doing RETURN * ORDER BY
Fixes #468
Merge pull request #539 from tinwelint/fix-468

Fixes #468
Fixes store locking issue in HA under windows

StoreLocker is now doing its work on start()/stop() so is is possible to unlock
 a store without shutting down the database
StoreLockerLifecycleAdapter is exposed from the DependencyResolver in IAGD
HAMS now releases the store lock before copying over a fresh store from master
Wrap default config files to 80 char lines
Multiple fixes and updates for Cypher profiler

o Added support for cypher profiling in REST
o Introduces SimpleVal and retypes PlanDescriptions
o Refactors PlanDescription and SimpleVal rendering
o Adds tests
o Added unit tests for the profiler
o Made Pipe more explicit about input iterators
Merge pull request #546 from chrisleishman/wraplines

Wrap default config files to 80 char lines
Minor fixes to docs and REST representation of cypher profiler found in acceptance testing
Merge branch 'master' into 2.0

Conflicts:
	community/cypher/CHANGES.txt
	community/cypher/src/main/scala/org/neo4j/cypher/internal/executionplan/ExecutionPlanBuilder.scala
	community/cypher/src/main/scala/org/neo4j/cypher/internal/pipes/UnionPipe.scala
	community/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TxManager.java
	community/server/src/docs/dev/rest-api/cypher.asciidoc
	community/server/src/functionaltest/java/org/neo4j/server/rest/CypherFunctionalTest.java
	community/server/src/main/java/org/neo4j/server/rest/repr/CypherResultRepresentation.java
	community/server/src/main/java/org/neo4j/server/rest/web/CypherService.java
	cypher-plugin/src/main/java/org/neo4j/server/plugin/cypher/CypherPlugin.java