Improve process of draining fed cluster

Instead of waiting for all jobs to clear out of the system, wait until
all jobs are completed. This helps so that you don't have to wait as
long for the cluster to be drain and or removed.