Merge branch 'ijackson'

diff --combined yarrg/commod-update-receiver
index 889913d3c6b717a5ebc41c71179c16072cf73860,cd9ef83c4e10a988ed5d17a44690c0435eb6b5dc..3ae1a6208a0fb01eaceaf3c3eeb291842b34ebe1
--- 1/yarrg/commod-update-receiver
--- 2/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@@ -25,6 -25,20 +25,6 @@@
  # are used without permission.  This program is not endorsed or
  # sponsored by Three Rings.
  
 -# All calls contain:
 -#  clientname                 "ypp-sc-tools"
 -#  clientversion              2.1-g2e06a26  [from git-describe --tags HEAD]
 -#  clientfixes                        "lastpage"  [space separated list]
 -#
 -# Timestamp requests contain:
 -#  requesttimestamp
 -#
 -# Uploads contain:
 -#  ocean                      canonical mixed case
 -#  island                     canonical mixed case
 -#  data filename=deduped.tsv.gz       output of yarrg --tsv
 -
 -
  use strict (qw(vars));
  use POSIX;
  use MIME::Entity;
@@@ -133,9 -147,10 +133,10 @@@ foreach my $mid (<_mid-*.hold>) 
      unlink $mid or $!==&ENOENT or die "$mid $!";
  }
  
+ $o{'instance'}= $ENV{'YARRG_INSTANCE'};
  
  my $mcontent= MIME::Entity->build(To => 'yarrg-commod-updates',
-                                 Subject => $pwd,
+                                 Subject => $ENV{'YARRG_INSTANCE'},
                                  Type => 'multipart/mixed',
                                  Boundary => '=',
                                  'Message-ID' => $mid,