Fixed #2241967: Invalid preferred services on form validation.
Merge branch '7.x-4.x' into issues/2241967-preferred-services
Fixed #2241967: Preferred services did not validate.