Merge branch 'master' into psgi

* master:
  Fix failing test - render_file_contents is expected to return the filename
  Changelog
  set permissions of script/*.pl to 0755
  allow changing permissions to 0000
  Fix RT#67303: -scripts changes permissions of original files
  Fix duplicate 'use Test::More' statement in generated components

diff --cc lib/Catalyst/Helper.pm
Simple merge