Merge change I96c50a53

* changes:
  Modified the paths to the bootloader to allow for debug build types as well as release build types.