disambiguate "pid" in function names
replace restc with hackney for neo4j driver
fix some errors in pre-R16B02