Merge "Fix MergeCommandTest to pass if File.executable is not supported" into stable-1.2