Merge branch 'm30_MDL-51554_Apache_PHP-FPM_Broken_File_Serving' of https://github...