redefine pulp_version macro to be based on release#.
Fix to handle non-numerics in the release.
Merge branch 'jortel-896027' into pulp-2.0

Conflicts:
	pulp-rpm.spec