fix bug - while editing was not possible to save under the same short_name (Region) or user (Participant)

Change-Id: I2fc7ee349092f694e308d0738f5a033fee776069
Merge "fix bug - while editing was not possible to save under the same short_name (Region) or user (Participant)"