Merge changes I05871a8a,I8baec836

* changes:
  Refactor loading boot image.
  Remove boot image begin/size from image header.