Refactor enterprise config

Change-Id: I7104250e80317fce6164385701a7caffbcd14813
4 files changed