Fix requirements file ordering

We have been enforcing alphabetical ordering in requirements file.
See https://review.openstack.org/#/c/66090/
These wrong ordering will cause problems with the change to enforce
that ordering.

Change-Id: Iaddd33aba22a2cf58b2a2fa69d64925848f6e1d7
Enforce alphabetical ordering in requirements file

Change-Id: Iaaa52acaa6005d9fbcd17b23523f61cea16e5a30
Merge "Fix requirements file ordering"
Merge "Enforce alphabetical ordering in requirements file"