Merge "Add help option to Config Settings"

diff --cc etc/heat/heat.conf.sample
Simple merge

diff --cc heat/common/config.py
Simple merge

diff --cc heat/common/wsgi.py
index 602a19503082a2d472ca5d03d80ea1005038f31a,26d20685a3d18920a7ef10d8fd712d98bbb08dd2..6d047451624a578410525c8ae5b1fd0d4ae0474c
--- 1/heat/common/wsgi.py
--- 2/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@@ -50,9 -49,16 +50,12 @@@ from heat.openstack.common import impor
  
  URL_LENGTH_LIMIT = 50000
  
 -# TODO(shadower) remove this once eventlet 0.9.17 is in distros Heat
 -# supports (notably Fedora 17 and Ubuntu 12.04 and newer)
 -eventlet.wsgi.MAX_REQUEST_LINE = URL_LENGTH_LIMIT
 -
  bind_opts = [
-     cfg.StrOpt('bind_host', default='0.0.0.0'),
-     cfg.IntOpt('bind_port'),
+     cfg.StrOpt('bind_host', default='0.0.0.0',
+                help=_('Address to bind the server.  Useful when '
+                       'selecting a particular network interface.')),
+     cfg.IntOpt('bind_port',
+                help=_('The port on which the server will listen.'))
  ]
  
  cfg.CONF.register_opts(bind_opts)