Merge "fix installation of manta bootloader" into jb-mr1-dev