Make the token stores use the new PageCache API
Merge branch '2.2-future-2' of github.com:chrisvest/neo4j into 2.2-future-2