Merge "Global cleanup of restconf client dependencies"