Merge from crlfutf8(with utf-8 sig and with Xignore-whitespaces-at-eol)