Merge pull request #613 from Mirantis/cobbler-net

move delimiter due to cobbler parser bug
Cinder fixes
Add primary controller role
Merge murano and heat with yaml facts
Added glance cache cleaning and pruning
Merge pull request #614 from dmitryilyin/cinder_fixes

Cinder fixes
ntp setup on Ubuntu nodes
Ubuntu ntp templat
double ampersands
move line seperator
Merge pull request #618 from Mirantis/ntp-ubuntu

NTP for ubuntu
Merge pull request #575 from xarses/prd1225

Use file_system field from fixture when formatting partitions
[PRD-1929] fix for empty savanna_hash
Merge pull request #619 from Mirantis/prd1929

[PRD-1929] fix for empty savanna_hash
cirros-0.3.1
Merge pull request #620 from dmi-try/cirros-3.1

+2
get rid of third-party module
Rebase on single yaml
Merge branch 'master' into savanna_murano_heat

Conflicts:
	deployment/puppet/osnailyfacter/examples/site.pp
merge with master