Synchronize shashlik

@ianna - I think this should bring the various shashlik scenarios into sync modulo the changes in the actual shashlik.  Can you check this?