Merge pull request #6880 from slavapestov/subst-map-refactor

AST: Have SubstitutionMaps manage the memory for the conformance array