Merge "Set max_template_size to heat's default value"