Fix typo.
Standardise --dbsnp option using macros when possible.

Bugfix: in unified_genotyper.xml it was possible to specify the option more
than once, which causes a GATK error.