issue #20237: Fix show stopper problems with incident.
Merge pull request #330 from jrogelstad/20237

issue #20237: Fix show stopper problems with incident.
issue #19045: Fix state and other duplicate check problems.
currency in currency_rate is now natural key
Merge pull request #332 from shackbarth/curr

currency in currency_rate is now natural key
Merge pull request #331 from jrogelstad/19045

issue #19045: Fix state and other duplicate check problems.