Re-organize the code to avoid conflict in cherry-pick

Signed-off-by: Stephen Sun <[email protected]>

orchagent/flexcounterorch.cpp

@@ -143,6 +143,14 @@ void FlexCounterOrch::doTask(Consumer &consumer)
                         }
                     }
                 }
+                else if (field == BULK_CHUNK_SIZE_FIELD)
+                {
+                    bulk_chunk_size = value;
+                }
+                else if (field == BULK_CHUNK_SIZE_PER_PREFIX_FIELD)
+                {
+                    bulk_chunk_size_per_counter = value;
+                }
                 else if(field == FLEX_COUNTER_STATUS_FIELD)
                 {
                     // Currently, the counters are disabled for polling by default
@@ -253,14 +261,6 @@ void FlexCounterOrch::doTask(Consumer &consumer)
                     // If it is exist and the value is 'true' we need to skip the iteration in order to delay the counter creation.
                     // The field will clear out and counter will be created when enable_counters script is called.
                 }
-                else if (field == BULK_CHUNK_SIZE_FIELD)
-                {
-                    bulk_chunk_size = value;
-                }
-                else if (field == BULK_CHUNK_SIZE_PER_PREFIX_FIELD)
-                {
-                    bulk_chunk_size_per_counter = value;
-                }
                 else
                 {
                     SWSS_LOG_NOTICE("Unsupported field %s", field.c_str());