avoid modified patchperl replacing original file
Updated CGI.pm tests; It might be inappropriate as test target as it does not seem to be stable...
auto-merge staging into master