Merge changes Ibff1f74e,Ic82595cf

* changes:
  fastboot: Added tos as an optional image
  fastboot: Fixed optional entries