Update infra type.yaml.tmpl
Merge pull request #15 from enovance/update_infra

Update infra type.yaml.tmpl
Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/common.yaml.tmpl