Fix deadlock in service requests when running local callbacks (backport #671)

Fix deadlock in service requests when running local callbacks (backport #671) #2355