Merge "HwVTEP JUNITs, and fixing show:vxlan CLI"