Yemen political parties to agree prisoner swap terms 'within days' as UK pledges millions to shore up peace deal