CB-6976 fixes deploy error when --nobuild option specified