Merge "Fix contrail-api workers for OS + OC4.x" into release/2019.2.0