Merge "Add wait-for.sh to control container boot order"