Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src

* 'fpm-apparmor-fixed' of https://github.com/notti/php-src:
  Add some basic and apparmor tests to fpm
  Add --force-stderr to fpm
  Add apparmor change hat functionality to fpm

diff --cc run-tests.php
Simple merge

diff --cc sapi/fpm/config.m4
index bd6d64930b1fa240502b7cac2960feba5e1032c7,87c5a60c50d0fa000354aa6569b10583211ff5f1..ba2b8e2d82b47e26e66a9e5e843bfdc53a44422f
--- 1/sapi/fpm/config.m4
--- 2/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@@ -555,13 -571,14 +571,14 @@@ if test "$PHP_FPM" != "no"; the
        AC_FPM_EPOLL
        AC_FPM_POLL
        AC_FPM_SELECT
+         AC_FPM_APPARMOR
  
    PHP_ARG_WITH(fpm-user,,
 -  [  --with-fpm-user[=USER]  Set the user for php-fpm to run as. (default: nobody)], nobody, no)
 +  [  --with-fpm-user[=USER]    Set the user for php-fpm to run as. (default: nobody)], nobody, no)
  
    PHP_ARG_WITH(fpm-group,,
 -  [  --with-fpm-group[=GRP]  Set the group for php-fpm to run as. For a system user, this 
 -                  should usually be set to match the fpm username (default: nobody)], nobody, no)
 +  [  --with-fpm-group[=GRP]    Set the group for php-fpm to run as. For a system user, this 
 +                          should usually be set to match the fpm username (default: nobody)], nobody, no)
  
    PHP_ARG_WITH(fpm-systemd,,
    [  --with-fpm-systemd      Activate systemd integration], no, no)

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge