Kenya Resolves Oil Dispute with Uganda Amid Port Shift