Finish up plugin porting to global display

Also remove display = display which does nothing

lib/ansible/plugins/connection/accelerate.py

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

lib/ansible/plugins/connection/chroot.py

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

lib/ansible/plugins/connection/docker.py

@@ -39,7 +39,6 @@ from ansible.plugins.connection import ConnectionBase
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()

lib/ansible/plugins/connection/jail.py

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

lib/ansible/plugins/connection/libvirt_lxc.py

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

lib/ansible/plugins/connection/local.py

@@ -32,7 +32,6 @@ from ansible.plugins.connection import ConnectionBase
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()

lib/ansible/plugins/connection/paramiko_ssh.py

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

lib/ansible/plugins/connection/ssh.py

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

lib/ansible/plugins/connection/winrm.py

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

lib/ansible/plugins/connection/zone.py

@@ -34,7 +34,6 @@ from ansible.plugins.connection import ConnectionBase
 
 try:
     from __main__ import display
-    display = display
 except ImportError:
     from ansible.utils.display import Display
     display = Display()