Rather than moving connection option setting, fix defaults

This reverts the previous commit (d71834d) and instead fixes the problem
by making sure that options used by ConnectionInformation do not have
defaults set in the playbook objects so they're properly inherited from
the CLI options object if not otherwise specified in the play

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', default='smart')
+    _connection          = FieldAttribute(isa='string')
     _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', default=22)
+    _port                = FieldAttribute(isa='int')
     _remote_user         = FieldAttribute(isa='string')
 
     # Variable Attributes