fixed issue #171 unique index names
(cherry picked from commit e8dbfe668a67ef5c07523bb71969bc5d13b80678)