Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  grieg also gets buildd mail now
  busoni needs to treat bugs.d.o as a virtualdomain
  busoni is not bugs master (whatever that means)
  busoni is bugs mx
  add bts profile for mail, redux
  make it easier to exclude some checks based on profile; whitespace tidy
  add bts profile for mail
  retry rule for bounces that seems to have been lost
  don't copy and paste quite so many lines
  allow zivit to monitor their machines

diff --cc modules/debian-org/misc/local.yaml
Simple merge