Merge "Increase heat's default max_template_size"