Merge branch 'mlxsw-maintain-candidate-rifs'