am 91c27888: am d83e4f15: support for version 2 of block image diffs

* commit '91c27888517c514d1da8cbcd76fdc4b437d193f8':
  support for version 2 of block image diffs