Sort/clean setup.cfg

Change-Id: I68a1073d7ef4e6610233961c4aba8c4378ee584b
Merge "Sort/clean setup.cfg"