Shashlik Numbering Scheme Record
Use new method for Shashlik SimHit
Add the approrpriate xml in cfis
Merge pull request #3008 from mark-grimes/mergePR2990

Rebase of pull request #2990