Merge branch 'mlxsw-Preparations-for-IPv6-UC-router'