wc-3423739/3423740 - fix re-ordering options in CiviCRM Options control

[bsilvern]

Overview

Corrects problems with re-ordering options in CiviCRM Options control when option labels have been changed or when there are many options.

See:

1. Issue 3423739
2. Issue 3423740

Before

Unable to correctly order static options under the above conditions.

After

Able to correctly order static options under the above conditions.

[jitendrapurohit]

Have tested this and confirmed it works.

@bsilvern Can you please fix these warnings while applying the patch

953.diff:34: trailing whitespace.
      
953.diff:44: trailing whitespace.
      //Add to the $field_options array any options that are disabled in the webform. 
953.diff:70: trailing whitespace.
        //delta to a value greater than Drupal::config('system.site')->get('weight_select_max') (default value 100) 
953.diff:73: trailing whitespace.
        '#delta' => !$element['#civicrm_live_options'] && sizeof($all_options) > 10 ? '101' : "10", 
warning: 4 lines add whitespace errors.

[KarinG]

Thank you @bsilvern - I just kicked off the tests one more time and on pass will merge.

[bsilvern]

@KarinG Any reason this has not yet been merged?

[KarinG]

No particular reason!