Makefile: update eraseconfig target to reflect changes wrt collections.
Setup.py regression after collection changes.
Setup.py regression after deletion of bash complections.
Merge pull request #1255 from jmaas/master

Fix several regressions