Merge "Bug 8153: Enforce check-style rules for netconf-api"