Merge "Change instances of Openstack to OpenStack."

diff --cc etc/neutron.conf
Simple merge

diff --cc neutron/plugins/common/utils.py
index d938d8893ddaee35376dea01b60d384a0445b060,694423d68bcc29a6e23b7eedaa1d7ea6600daacf..47281b5cf16eed968c53e1c8605cc30ca9c70132
--- 1/neutron/plugins/common/utils.py
--- 2/neutron/plugins/common/utils.py
+++ b/neutron/plugins/common/utils.py
@@@ -13,13 -13,9 +13,13 @@@
  #    under the License.
  
  """
- Common utilities and helper functions for Openstack Networking Plugins.
+ Common utilities and helper functions for OpenStack Networking Plugins.
  """
  
 +import hashlib
 +
 +from oslo_log import log as logging
 +import six
  import webob.exc
  
  from neutron.api.v2 import attributes

diff --cc neutron/plugins/ml2/drivers/brocade/README.md
Simple merge