[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17774: Fix bug 1404691: wrongly named audit table in orgunit merge query causes merge to fail.