* fixed centos imcomptiable
Merge commit 'dd70962'

Conflicts:
	modules/vsfs/manifests/google.pp