Ported Johan Walters fix to 1.5.x branch

Made regexes more robust against new un/edifact definitions. This fix allow us to compile newer versions of unedifact( d12a, etc. ) in 1.5.x too