Introduce CypherOptionParser
Switch top-level CypherCompiler to using CypherOptionParser

o Rename Prepared to ParsedQuery and clean up interface
o Fix CypherOptionParser's parsing of versions
Extract common code into Base
Merge pull request #2757 from systay/pre-parser

Introduce a pre-parser in preparation for PROFILE/EXPLAIN
Merge 2.1-maint into master
Merge pull request #2764 from systay/2.1-merge-into-master

2.1 merge into master
Add an implementation to clearCache()
Remove old unnecessary configuration property from the test
Cleanup and removing empty todo
Fix: remove terminated transaction when counting commited transaction in getNumberOfCommittedTransactions()
Fix: use the correct builder in HighlyAvailableGraphDatabaseFactory
Reenabling transaction monitor in HA after JTA removal
Introduce AbstractTokenCreator to factorize out common code in
- SlaveLabelTokenCreator
- SlavePropertyTokenCreator
- SlaveRelationshipTypeCreator
by using a template method pattern

Add test for AbstractTokenCreator
Reenable UpdatePullerTest
Remove empty TODO and little cleanup