Merge "Incorrect name of elements in yang case nodes"