Support for PHP5-FPM
Support for PHP5-FPM - fixed class name
Support for PHP5-FPM - fixed php dependency
Support for PHP5-FPM - fixed condition dependency
Support for PHP5-FPM - fixed condition dependency
Merge remote-tracking branch 'origin/master'

Conflicts:
	manifests/mod/php.pp
	templates/mod/php5-fpm.conf.erb