Merge "Yang model changes for multiple VxLAN tunnel support"