Fix ordering in setup.cfg

The console scripts listing in setup.cfg was alphabetically ordered
for ease of reading, make it that way again.

Change-Id: I973ef1741ac515decb81b3b67b94f73589ffd87d
Merge "Fix ordering in setup.cfg"