Merge "Fix contrail-api workers for OS + OC4.x"