Improve performance of obsolete slave termination, and correct log output
Do not attempt to deregister images the user does not own
Merge branch 'ami-builder'