Follow-up to r1778350 Remove useless tests in order to avoid the duplication of a message. Be consistent with "FPM" vs "PHP-FPM" usage messages. Fix style issues.