--- admin_tools/server_instance.rb.orig	2017-09-13 14:30:55.879009947 +0200
+++ admin_tools/server_instance.rb	2017-09-13 17:02:41.788092565 +0200
@@ -111,7 +111,7 @@
 		}.merge(options)
 		instances = []
 		
-		Dir["#{AdminTools.tmpdir}/passenger.*"].each do |dir|
+		Dir["#{AdminTools.tmpdir}/passenger.*","#{AdminTools.tmpdir}/*httpd*/tmp/passenger.*"].each do |dir|
 			next if File.basename(dir) !~ /passenger\.#{PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION}\.(\d+)\.(.+)\Z/
 			minor = $1
 			next if minor.to_i > PhusionPassenger::SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION
--- utils.rb.orig	2017-09-13 14:35:10.228171223 +0200
+++ utils.rb	2017-09-13 17:02:13.262291408 +0200
@@ -103,7 +103,9 @@
 	def connect_to_server(address)
 		case get_socket_address_type(address)
 		when :unix
-			return UNIXSocket.new(address.sub(/^unix:/, ''))
+            Dir.chdir(File.dirname(address.sub(/^unix:/, ''))) do
+			  return UNIXSocket.new(File.basename(address.sub(/^unix:/, '')))
+            end
 		when :tcp
 			host, port = address.sub(%r{^tcp://}, '').split(':', 2)
 			port = port.to_i