Removed double counting of expand when estimating cardinality
Merge pull request #3367 from pontusmelke/cardinality-tweak

Removed double counting of expand when estimating cardinality
Fixes a problem with StringEncoder encoding strings inproperly

probably introduced while removing garbage instances produced by it.
Here's another attempt, one that works. Also StringIdMapperTest is changed
to encode strings that were seen as troublesome previously, namely "1",
"2"... a.s.o.
Resolve varying use of neo4j vs neo4j-community

Now the dependencies are:
(neo4j-enterprise)-->(neo4j-advanced)-->(neo4j)-->(all individual modules)
(neo4j-community)-->(neo4j)

i.e. neo4j-community is only an alias for neo4j, kept for historical
reasons
Merge pull request #3354 from cleishm/module-cleanup

Resolve varying use of neo4j vs neo4j-community
Better generated configuration docs.

* Generates docs from more settings classes.
* Extracts information on valid values, deprecated or mandatory settings and default values.
* Makes every setting easy to link to.
* Uses new annotations @Internal and @Obsoleted to add information to settings.
* Cleans up language and formatting in settings descriptions.
* Upgrade of doctools, including moving to a JVM-based DocBook validation and better support for mobile devices.