updated setup files
Merge remote branch 'origin/package-centos6' into package-centos6

Conflicts:
	setup.cfg