Thisara, Siriwardana return to Sri Lanka ODI squad