Merge change I305e1b8f into eclair-mr2

* changes:
  add --esn option to am to allow adding extra with a null value