Refactor ONAP HEAT template config, part 3