Merge "Add object based wait capability to boto tests"