[voms-api-java3] Remove EPEL5-specific cruft, use macros & fix branch