Merge branch 'selftests-mlxsw-a-couple-of-fixes'