Siraj, Iyer included for NZ T20Is, Vijay returns for Lanka Tests