flake8 has very courteously referred us to another pyqca project and closed all comme...

flake8 has very courteously referred us to another pyqca project and closed all comments, thank you!  I'll get on that right away

pyqca/flake8-import-order does not seem to have a release or a commit
in the past two years, so while I have created an issue and PR [1] [2],
for now vendor our fork so we can get on with things.

Also fix one issue for flake8 6.0

[1] https://github.com/PyCQA/flake8-import-order/issues/189
[2] https://github.com/PyCQA/flake8-import-order/pull/190

Change-Id: I53045f65b8716cceaf2104fccc1d26f80b398fef
References: https://github.com/PyCQA/flake8/issues/1751
(cherry picked from commit fbec926c4744aa97a48a011939354c8b8f8be566)