am 54a90c3d: am f4e25916: am dc7e8177: Merge change I0f505e57 into eclair

Merge commit '54a90c3d1372389ed78e9bede8fd4a49e569ea4b'

* commit '54a90c3d1372389ed78e9bede8fd4a49e569ea4b':
  Checkpoint new rollo scripts.  Not currently in use.