Update bundled JRE to 1.7.0_45, in line with the other branches.
Allow instances to restart at election version 0. This will happen if an instance crashes and rejoins.
Fixed list parsing on empty string
On bind, update the ClusterConfiguration as well
Tagging for version 1.9.8
Back to development version.
Next snapshot version
Remove PrintFlags options from default config files
Merge pull request #2600 from cleishm/no-printflags

Remove PrintFlags options from default config files
Fix so that instances can crash and rejoin with a restarted election version

Conflicts:
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImpl.java
Updated UDC docs
Added RepeatRule from other branches
Keep building javadocs for assembly modules, but don't have standalone depend on them.

Conflicts:
	advanced/neo4j-advanced/pom.xml
	community/neo4j-community/pom.xml
	community/neo4j/pom.xml
	enterprise/neo4j-enterprise/pom.xml
Migrate the last legacy lucene index transaction log

This will allow us to transfer transactions through pull-updates in a cluster that has been recently upgraded from 1.9 to 2.0, and where legacy indexes are used.
Merge branch '2.0-maint' into 2.0-migrate-legacy-lucene-log

Conflicts:
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreMigratorIT.java
Address review comments by adding javadocs and a finally-clause.
Merge pull request #2635 from chrisvest/2.0-migrate-legacy-lucene-log

2.0 migrate legacy lucene log
Add support for Octal integers
Merge pull request #2643 from cleishm/cypher-octal-support

Add support for Octal integers in Cypher
Tagging for version 2.0.4
Back to development version.
2.0.5-SNAPSHOT