Merge "Add sleep after Contrail Control installation" into release/2019.2.0