Merge "Do not use inifinite connection retries to contrail-api" into release/2019.2.0