Add spec file changes (second try)

Have condor-ce-collector own condor-ce directories under /var
Have condor-ce-client require grid-certificates
Add optional %gitrev macro for easier versioning of pre-release builds
Merge changelogs