Tweak HaplotypeCaller workarounds for GATK 2.5-2