Jamieson, O'Rourke return to NZ Test squad for Ireland, England tours