Merge branch 'mlxsw-couple-of-fixes'