[RIC-346] Refactor E2 Setup flow and update EnGnb xml