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

* sort "removed" fns in index repodata.json  #3154
* fix deps being merged instead of clobbered  #3154
* Handle corrupt packages during indexing better  #3154

Contributors:
-------------

* @msarahan