Merge branch 'PRD-1710' of github.com:xenolog/fuel into PR3

Conflicts:
	deployment/puppet/osnailyfacter/examples/site.pp