Single Machine Reimage Failure Retries and Wait for log off

Currently when a re-image operation for a single machine is issued there is no way to set number of failures before aborting and there is no way to set the task to wait for the current user to log off. This is a feature on bulk reimages, not single reimages, please have feature parity between the two.