Integrating rpm patch to handle version in RPM and tarball

Conflicts:

	factory/glideFactoryEntry.py
	frontend/glideinFrontendElement.py
	lib/glideinWMSVersion.py