Hostage deal team returns from Doha, security cabinet to discuss deal tomorrow