Fix the Shashlik collections properly
Merge pull request #4791 from mark-grimes/fixShashlikCollections

Fix the Shashlik collections properly