UN and laws of war need 'fresh look', says head of aid charity Mercy Corps