Bug fixes:
----------

* fix loss of setup.cfg reading due to bad merge  #2163
* avoid error when attempting to sort list, and that list consists of dicts  #2163