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 manual build
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
Merged 'master' into 2.0
Small changes to improve exception messages
Made cypher the default fallback for the databrowser, meaning we get cypher parse errors instead of webadmin saying it doesn't know how to handle some query.
added warnings that Neo4j 1.9 does not officially support Oracle JDK 6
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 pull request #545 from lassewesth/jvmdetection

added warnings that Neo4j 1.9 does not officially support Oracle JDK 6
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
Changed so index queries and all-node queries use Iterator instead of Iterable
Minor Cypher optimizations

o Smarter node/relationship property handling
o Does not produce ColumnFilterPipes unless necessary
o Does not produce ExtractPipes unless necessary
Merge commit 'efb0a629249f7fc96e962983a853fcfe745c792e' into merge-branch

Conflicts:
	community/cypher/src/main/scala/org/neo4j/cypher/internal/spi/gdsimpl/GDSBackedQueryContext.scala
	community/cypher/src/test/scala/org/neo4j/cypher/GraphDatabaseTestBase.scala
Merge commit '60c2055a321a76a6bc7c7cec6bf47484e228d777' into merge-branch

Conflicts:
	community/cypher/src/main/scala/org/neo4j/cypher/internal/commands/PathExpression.scala
	community/cypher/src/main/scala/org/neo4j/cypher/internal/mutation/NamedExpectation.scala
	community/cypher/src/main/scala/org/neo4j/cypher/internal/spi/gdsimpl/GDSBackedQueryContext.scala
	community/cypher/src/test/scala/org/neo4j/cypher/ProfilerAcceptanceTest.scala