Fix to walrus service lookup EUCA-5554