Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'