Merge "Improve RESTCONF thread safety when reconfiguring"