merge revision(s) 39544,39546: [Backport #7992]

	* lib/fileutils.rb:  Revert r34669 which altered the way
	  metaprogramming in FileUtils occurred.  [ruby-trunk - Bug #7958]

	* test/fileutils/visibility_tests.rb:  Refactored tests of FileUtils
	  options modules to expose bug found in #7958

	* test/fileutils/test_dryrun.rb:  ditto.

	* test/fileutils/test_nowrite.rb:  ditto.

	* test/fileutils/test_verbose.rb:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40251 b2dd03c8-39d4-4d8f-98ff-823fe69b080e