Applied SF patch #2 from Solomon Bessire to add a SQL variation with configuration for DB2i
Added use-indexes-unique=false for db2 based on tip from Solomon Bessire
Small change to error message based on SF patch #3 from Solomon Bessire
Merge remote-tracking branch 'upstream/master'