Merge "tempest cleanup - don't initialize admin id's"