Fix multi comps and multi dist bugs
Fix multi comps and multi dist bugs

Fix line full_comp_list.union(set(kwargs['comps'])) which actually don't do anything, because union don't modify source set. Looks like typo...
It is possible to have multiple 'dist' in single repository, i.e. wheezy and wheezy-backports . So in consolidate repos, use dist also as a key.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt