Adding the possibility to not restart any service after php-agent install
Merge branch 'upstream_master'

Conflicts:
	recipes/php-agent.rb
Merge branch 'master' of github.com:gleseur/newrelic into gleseur-master
Merge branch 'gleseur-master'