Fix migration to handle foreign key on `control_id`
Add display name for logs for RiskAssessentControlMapping