Merge branch 'mlxsw-various-fixes'