eba6762977
With a minor rebase to fix a commit message [Closes #2270] Conflicts: spec/support/shared/contexts/msf/util/exe.rb