OIOnsiteRegistration - Numbers should not be globally unique

Change-Id: Ib6a833ef966a954283b46794c15b7706a1403a14
Merge "OIOnsiteRegistration - Numbers should not be globally unique"