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
Cosmetic changes to output in Upstart/init scripts