Revert "Rather than moving connection option setting, fix defaults"

This reverts commit 0345b675.

v2/ansible/executor/connection_info.py

@@ -64,14 +64,14 @@ class ConnectionInformation:
         self.no_log      = False
         self.check_mode  = False
 
+        if play:
+            self.set_play(play)
+
         #TODO: just pull options setup to above?
         # set options before play to allow play to override them
         if options:
             self.set_options(options)
 
-        if play:
-            self.set_play(play)
-
 
     def __repr__(self):
         value = "CONNECTION INFO:\n"

v2/ansible/playbook/play.py

@@ -56,11 +56,11 @@ class Play(Base, Taggable, Become):
     _accelerate_port     = FieldAttribute(isa='int', default=5099) # should be alias of port
 
     # Connection
-    _connection          = FieldAttribute(isa='string')
+    _connection          = FieldAttribute(isa='string', default='smart')
     _gather_facts        = FieldAttribute(isa='string', default='smart')
     _hosts               = FieldAttribute(isa='list', default=[], required=True)
     _name                = FieldAttribute(isa='string', default='<no name specified>')
-    _port                = FieldAttribute(isa='int')
+    _port                = FieldAttribute(isa='int', default=22)
     _remote_user         = FieldAttribute(isa='string')
 
     # Variable Attributes