Merge "fix wrong desciption of monkey_patch config"

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

diff --cc etc/cinder/cinder.conf.sample
index 1389343dd434ad2dc1012f833ea52c1e576c3fc6,0e7e0ae30fdb0de3d5f6f55f59c350f8651a301a..8d5fcfc244a9e902f1dae0eac7658aea867ea6b2
--- 1/etc/cinder/cinder.conf.sample
--- 2/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@@ -420,9 -420,9 +420,9 @@@
  
  # Path to the rootwrap configuration file to use for running
  # commands as root (string value)
 -#rootwrap_config=<None>
 +#rootwrap_config=/etc/cinder/rootwrap.conf
  
- # Whether to log monkey patching (boolean value)
+ # Enable monkey patching (boolean value)
  #monkey_patch=false
  
  # List of modules/decorators to monkey patch (list value)