bootloader - use include_wrappers, clean the patch
Merge pull request #488 from lslezak/update_bootloader_patch

bootloader - use include_wrappers, clean the patch