diff --git a/cinder/api/extensions.py b/cinder/api/extensions.py
index 04643466399..67e682a0cce 100644
--- a/cinder/api/extensions.py
+++ b/cinder/api/extensions.py
@@ -269,9 +269,8 @@ class ExtensionManager(object):
 
         extensions = list(self.cls_list)
 
-        # NOTE(thingee): Until we update devstack to have the new location,
-        # we'll just set replace the old contrib path with the new and preserve
-        # any other extensions that need to be loaded
+        # NOTE(thingee): Backwards compat for the old extension loader path.
+        # We can drop this post-grizzly in the H release.
         old_contrib_path = ('cinder.api.openstack.volume.contrib.'
                             'standard_extensions')
         new_contrib_path = 'cinder.api.contrib.standard_extensions'
diff --git a/cinder/flags.py b/cinder/flags.py
index 9e859d41a9b..4546d1b5491 100644
--- a/cinder/flags.py
+++ b/cinder/flags.py
@@ -147,13 +147,8 @@ global_opts = [
                 help='Specify list of extensions to load when using osapi_'
                      'volume_extension option with cinder.api.contrib.'
                      'select_extensions'),
-    # NOTE(thingee): default contrib for old and new location for compatibility
     cfg.MultiStrOpt('osapi_volume_extension',
-                    default=[
-                        'cinder.api.openstack.volume.contrib.'
-                        'standard_extensions',
-                        'cinder.api.contrib.standard_extensions',
-                    ],
+                    default=['cinder.api.contrib.standard_extensions'],
                     help='osapi volume extension to load'),
     cfg.StrOpt('osapi_volume_base_URL',
                default=None,
diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 40b5c34917f..bc08034a424 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -126,7 +126,6 @@
 #osapi_volume_ext_list=
 
 # osapi volume extension to load (multi valued)
-#osapi_volume_extension=cinder.api.openstack.volume.contrib.standard_extensions
 #osapi_volume_extension=cinder.api.contrib.standard_extensions
 
 # Base URL that will be presented to users in links to the
@@ -598,6 +597,33 @@
 #qpid_tcp_nodelay=true
 
 
+#
+# Options defined in cinder.openstack.common.rpc.impl_zmq
+#
+
+# ZeroMQ bind address. Should be a wildcard (*), an ethernet
+# interface, or IP. The "host" option should point or resolve
+# to this address. (string value)
+#rpc_zmq_bind_address=*
+
+# MatchMaker driver (string value)
+#rpc_zmq_matchmaker=cinder.openstack.common.rpc.matchmaker.MatchMakerLocalhost
+
+# ZeroMQ receiver listening port (integer value)
+#rpc_zmq_port=9501
+
+# Number of ZeroMQ contexts, defaults to 1 (integer value)
+#rpc_zmq_contexts=1
+
+# Directory for holding IPC sockets (string value)
+#rpc_zmq_ipc_dir=/var/run/openstack
+
+# Name of this node. Must be a valid hostname, FQDN, or IP
+# address. Must match "host" option, if running Nova. (string
+# value)
+#rpc_zmq_host=cinder
+
+
 #
 # Options defined in cinder.openstack.common.rpc.matchmaker
 #
@@ -1070,4 +1096,4 @@
 #volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
 
 
-# Total option count: 238
+# Total option count: 244