Rediff patches, dropping two applied upstream.

Rylie Pavlikrequested to merge
rpavlik/diamond-aligner:master into master

Drop multi_arch: applied upstream Drop fix_i386_and_s390x: applied upstream

Merge request reports