Merge "BUG-1495: fail future when no local RPC is found"