Synchronize cinder.conf template with Icehouse

There's no functional change yet.

Note that some new options for NetApp were not added yet (so are still
in the diff) because we need to figure out if we care about them. These
are:
  netapp_webservice_path
  netapp_controller_ips
  netapp_sa_password
  netapp_storage_pools
  netapp_copyoffload_tool_path
Good catch, it got lost in the rebase.