Connacht have agreed a deal to bring Fionn Carr back to the club and joining him will be Munster hooker Sean Henry.