Merged in chunk-name-format changes from 9.4 branch.  SMemTest::testISupportWithLearning still fails but for different reason (problem variablizing an LTI causing problem with re-orderer).  Keeping that test disabled for now.  Passes other unit tests and naming chunks properly.