Merge branch 'merge'

Merge branch 'merge'

* merge:
  new arch specific contents files; get override type id from database instead of hardcoded
  make p-u use the new utils.temp_dirname() method
  don't import tempfile in contents.py
  move mkdtmp to utils.temp_directory
  Revert "Revert "Merge commit 'stew/content_generation' into merge""
  fixing Binary.reject.  adding better logging when we get an error in contents insertion
  back to ./ for tarballs
  get contents branch working with etch era pacakges