Merge branch 'mlxsw-Preparations-for-VxLAN-support'