obsolete previous package name
Remove obsoleted packages from conflicts
Merge branch 'SERVER-13563' of github.com:ehershey/mongo into SERVER-13563

Conflicts:
	rpm/mongodb-enterprise.spec
	rpm/mongodb-org.spec