more options for cga-gen.py to use pre-defined modifier or collision count
copied permanent ldns_sha1 fix