Fix up php5-fpm Upstart job configuration file

Detect php5-fpm configuration errors correctly, set appropriate
expect fork flag, and some general file cleanup.
Fix php5-fpm init.d script configuration file test
Merge pull request #41 from salaman/initfix

Fix-up php5-fpm configuration tests in init scripts
Sync with Debian
PHP 5.5.2 - Wheezy
php5-fpm-checkconf : fixed regex