diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 4db6222ea4..f55f67e6ab 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -489,13 +489,12 @@
 # value)
 #protocol=http
 
-# Time interval (in seconds) for successive awake call
-# to AMT interface, this depends on the IdleTimeout
-# setting on AMT interface. AMT Interface will go to
-# sleep after 60 seconds of inactivity by default.
-# IdleTimeout=0 means AMT will not go to sleep at all.
-# Setting awake_interval=0 will disable awake call. (integer
-# value)
+# Time interval (in seconds) for successive awake call to AMT
+# interface, this depends on the IdleTimeout setting on AMT
+# interface. AMT Interface will go to sleep after 60 seconds
+# of inactivity by default. IdleTimeout=0 means AMT will not
+# go to sleep at all. Setting awake_interval=0 will disable
+# awake call. (integer value)
 #awake_interval=60
 
 
@@ -583,6 +582,17 @@
 
 [conductor]
 
+#
+# Options defined in ironic.conductor.base_manager
+#
+
+# The size of the workers greenthread pool. (integer value)
+#workers_pool_size=100
+
+# Seconds between conductor heart beats. (integer value)
+#heartbeat_interval=10
+
+
 #
 # Options defined in ironic.conductor.manager
 #
@@ -592,9 +602,6 @@
 # value)
 #api_url=<None>
 
-# Seconds between conductor heart beats. (integer value)
-#heartbeat_interval=10
-
 # Maximum time (in seconds) since the last check-in of a
 # conductor. A conductor is considered inactive when this time
 # has been exceeded. (integer value)
@@ -628,9 +635,6 @@
 # thread pool size. (integer value)
 #periodic_max_workers=8
 
-# The size of the workers greenthread pool. (integer value)
-#workers_pool_size=100
-
 # Number of attempts to grab a node lock. (integer value)
 #node_locked_retry_attempts=3
 
@@ -1343,7 +1347,7 @@
 # Optionally specify a list of memcached server(s) to use for
 # caching. If left undefined, tokens will instead be cached
 # in-process. (list value)
-# Deprecated group/name - [DEFAULT]/memcache_servers
+# Deprecated group/name - [keystone_authtoken]/memcache_servers
 #memcached_servers=<None>
 
 # In order to prevent excessive effort spent validating
diff --git a/ironic/common/config_generator/generator.py b/ironic/common/config_generator/generator.py
index 0f14f47bd2..ed4318c580 100644
--- a/ironic/common/config_generator/generator.py
+++ b/ironic/common/config_generator/generator.py
@@ -221,7 +221,7 @@ def print_group_opts(group, opts_by_module):
         print('#')
         print('')
         for opt in opts:
-            _print_opt(opt)
+            _print_opt(opt, group)
         print('')
 
 
@@ -263,7 +263,7 @@ def _sanitize_default(name, value):
     return value
 
 
-def _print_opt(opt):
+def _print_opt(opt, group):
     opt_name, opt_default, opt_help = opt.dest, opt.default, opt.help
     if not opt_help:
         sys.stderr.write('WARNING: "%s" is missing help string.\n' % opt_name)
@@ -281,7 +281,7 @@ def _print_opt(opt):
             deprecated_name = (deprecated_opt.name if
                                deprecated_opt.name else opt_name)
             deprecated_group = (deprecated_opt.group if
-                                deprecated_opt.group else "DEFAULT")
+                                deprecated_opt.group else group)
             print('# Deprecated group/name - [%s]/%s' %
                   (deprecated_group,
                    deprecated_name))