Merge "Modifications to error handling in restconf"