Merge "Bug 451 - Fix netconf exception handling"