Bug 936222: clean up old, unused nextSlave functions. r=rail
implement aws_wait for next slave function
Fix up logging and add tests!