update conftree and netcon
Authored by: Jean-Francois Dockes 2018-06-16
Parent(s): [1cada4]
Child(ren): [f0f9de]