Merge "Add timeout to wait_for_tiller state"