Merge "Fix for Contrail API return code"