master
7903580: Allow for re-attempting agent creation when an attempt fails
7901941: Consolidate test layout