am bf72820e: am b292461c: Merge change I305e1b8f into eclair-mr2

Merge commit 'bf72820e7775748c7239287b49b81031167b3428'

* commit 'bf72820e7775748c7239287b49b81031167b3428':
  add --esn option to am to allow adding extra with a null value