Merge remote-tracking branch 'neo4j/master' into 2.0

Conflicts:
	advanced/server-advanced/src/main/java/org/neo4j/server/advanced/modules/JMXManagementModule.java
	community/server/src/main/java/org/neo4j/server/database/CommunityDatabase.java
	community/server/src/main/java/org/neo4j/server/modules/RESTApiModule.java
	community/server/src/test/java/org/neo4j/server/WrappingNeoServerBootstrapperDocIT.java
	community/server/src/test/java/org/neo4j/server/database/EphemeralDatabase.java
	community/server/src/test/java/org/neo4j/server/database/TestCommunityDatabase.java
	community/server/src/test/java/org/neo4j/server/helpers/ServerBuilder.java
	community/server/src/test/java/org/neo4j/server/modules/RESTApiModuleTest.java
	enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/TestEnterpriseDatabase.java
	enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/functional/EnterpriseServerIT.java
	packaging/qa/src/test/java/org/neo4j/qa/features/StartAndStopFeatureTest.java
Merge remote-tracking branch 'origin/master' into 2.0-master-merge

Conflicts:
	community/server/src/test/java/org/neo4j/server/helpers/ServerHelper.java