Merge branch 'mlx4-misc-fixes'