Deployment has failed due to Duplicate declaration error

[ElenaRossokhina]

Deploy fails with the following message:
Deployment has failed. Critical nodes failed: Node[1]. Stopping the deployment process!
Steps for reproducing:
1) Create new environment
2) Add nodes with 1 - Controller, Storage - Cinder, 1 - Compute, Storage - Cinder Block Device. Neutron with VLAN.
     Additional Components: Sahara.

Expected result: deploy OK

Actual result: deploy fails, both nodes are in the 'error' state

In puppet log:
2016-03-23 20:49:41 ERR /usr/lib/ruby/vendor_ruby/puppet/resource/catalog.rb:500:in `fail_on_duplicate_type_and_title'
2016-03-23 20:49:41 ERR Duplicate declaration: Cinder_config[DEFAULT/volume_clear] is already declared in file /etc/puppet/modules/cinder/manifests/volume.pp:78; cannot redeclare at /etc/puppet/modules/cinder/manifests/config.pp:38 on node node-2.test.domain.local
2016-03-23 20:49:40 WARNING (Scope(Class[Keystone::Python])) This class is deprecated, has no effect, and will be removed in Newton
2016-03-23 20:49:40 NOTICE (Scope(Class[main])) MODULAR: cinder.pp

Here is diagnostic snapshot: https://drive.google.com/a/mirantis.com/file/d/0B2ag_Bf-ShtTYXZBeUJuemxoQWc/view?usp=sharing