Revert "Merge pull request #967 from rosenfeld/patch-1"

This reverts commit 1f69d3689a, reversing
changes made to a0dccd88e6.

lib/capistrano/dsl/env.rb

@@ -45,8 +45,11 @@ module Capistrano
 
       def release_roles(*names)
         options = { exclude: :no_release }
-        options.merge! names.pop if names.last.is_a? Hash
-        names << options
+        if names.last.is_a? Hash
+          names.last.merge(options)
+        else
+          names << options
+        end
         roles(*names)
       end