Fix error in merge: dnl had been retained

Also sync some whitespace with v8.5.19
Regenerate configure script
Increment version
Ignore more files