The job is running for more than 30 minutes, slowing down all deployments. We must find a solution before reverting this MR. refs #3413
@kathyw could you please review?