Merge "Improve xml lookup in edit-config rpc for md-sal"