CGIV-1536: Ensure we try to restart the upstart job and not the init.d script
Merge branch 'master' into CGIV-1536-trusty
CGIV-1536: Ensure that each php-fpm instance creates a listener with the correct user/group