tree b52855c14a7df4aa658dbe0303a764b0ef251f14
parent dfa5195111cd09e6dadf0f82e84a64db5e1ad6b1
author Jonathan Hart <jono@opennetworking.org> 1512430980 -0800
committer Jonathan Hart <jono@opennetworking.org> 1512430980 -0800

Cleanup and consolidate some stages

Change-Id: Iaeb84d11c4f1cfd08b642cd340e17a62f39ce46e