Sort openstack-infra/-dev entries in layout.yaml

Sort and check for sorting of openstack-infra and
openstack-dev entries in zuul/layout.yaml.

Change-Id: I643aecb6052f14c2960a3077fbf391e3a82947c9
Merge "Sort openstack-infra/-dev entries in layout.yaml"