Merge "Bug 624 - Separate netty and exi specific classes from netconf-util."