Merge change I715333b8 into eclair

* changes:
  Add support for dumping RS objects to aid in debugging of white blocks bug.