Merge "Optimize netconf capability handling"