Made suggested revisions

bootstrap.py

@@ -1164,8 +1164,6 @@ def exec_service(service, command, failonerror=True):
             create_host()
         configure_subscription_manager()
         migrate_systems(options.org, options.activationkey)
-        if 'foreman' not in options.skip:
-            delete_file('/etc/rhsm/facts/location.facts')
         if options.enablerepos:
             enable_repos()
     elif options.new_capsule:
@@ -1261,6 +1259,9 @@ def exec_service(service, command, failonerror=True):
         if options.enablerepos:
             enable_repos()
 
+    if options.location and 'foreman' in options.skip: 
+        delete_file('/etc/rhsm/facts/location.facts')
+
     if not options.remove and not options.new_capsule:
         # > IF not removing, install Katello agent, optionally update host,
         # >                  optionally clean and install Puppet agent