Fix Container cleanup, which has stopped working with newer daemons

Newer deploys were not getting cleaned up because the output from the (versioned!) API changed.  The new output text was not being properly scraped.  This should now work with either the old API or the new one.  Includes a test of the new format as well.

@jessedearing @aughr  review appreciated.
 
cc @rkive