Bug77253 TestCase Template mashup fixes
Merge pull request #47 from roadhump/feature/bug77253

Bug77253 TestCase Template mashup fixes