Merge pull request #2247 from hafriedlander/fix/flush_24

FIX: Have ParameterConfirmationToken work regardless of include path
FIX: Fixed TempPath inclusion for phpunit & cli-script