am 4ab3671c: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4ab3671c4ffc89733d40aa166ec173b450e5cafd':
  Fix directory provider authority name & export provider
  Make sure we send attachments when not smart-forward