Re #1627 Merge ApiBeanImpl to neo4j branch