Finish up plugin porting to global display

Also remove display = display which does nothing

lib/ansible/cli/__init__.py

@@ -36,7 +36,6 @@ from ansible.utils.unicode import to_bytes
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()

lib/ansible/cli/adhoc.py

@@ -36,7 +36,6 @@ from ansible.vars import VariableManager
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()

lib/ansible/cli/doc.py

@@ -33,7 +33,6 @@ from ansible.utils import module_docs
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()

lib/ansible/cli/galaxy.py

@@ -40,7 +40,6 @@ from ansible.playbook.role.requirement import RoleRequirement
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()

lib/ansible/cli/playbook.py

@@ -35,7 +35,6 @@ from ansible.vars import VariableManager
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()

lib/ansible/cli/pull.py

@@ -35,7 +35,6 @@ from ansible.utils.cmd_functions import run_cmd
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()

lib/ansible/cli/vault.py

@@ -29,7 +29,6 @@ from ansible.cli import CLI
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()