Merge "Bump netconf version to 7.0.4"