merge revision(s) 42459: [Backport #8963]

	* tool/make-snapshot: Fix order of priority for option parameter.


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