Merge latest samtools-hybrid that fails on missing EOF
snpcall test - Fix espected results for param output