Merge "Fixing format_flavor to handle flavor extra_specs"