Merge "Fix config transaction handling in netconf."