Change all_in_one node names to be hostnames

Add waits on build-server as well