CORD-1250 Update to new Service/Tenancy models

Change-Id: I8edcc9880b69c9435733540c5a4841db616d1914
diff --git a/xos/admin.py b/xos/admin.py
index 84e0ecd..2cbbecb 100644
--- a/xos/admin.py
+++ b/xos/admin.py
@@ -11,7 +11,7 @@
 from django.utils import timezone
 from django.contrib.contenttypes import generic
 from suit.widgets import LinkedSelect
-from core.admin import ServiceAppAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, XOSTabularInline, ServicePrivilegeInline, TenantRootTenantInline, TenantRootPrivilegeInline
+from core.admin import ServiceAppAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, XOSTabularInline, ServicePrivilegeInline
 from core.middleware import get_request
 
 from functools import update_wrapper
@@ -57,11 +57,10 @@
                           'classes':['suit-tab suit-tab-general']})]
     readonly_fields = ('backend_status_text', 'service_specific_attribute',)
     form = CordSubscriberRootForm
-    inlines = (TenantRootPrivilegeInline) # VOLTTenantInline
 
     suit_form_tabs =(('general', 'Cord Subscriber Root Details'),
 #        ('volttenants','VOLT Tenancy'),
-        ('tenantrootprivileges','Privileges')
+#        ('tenantrootprivileges','Privileges')
     )
 
     def get_queryset(self, request):