use jb branches with bootloader & diskinstaller

Change-Id: I20f2c3a63a9766fb0db5094c98de370c46ed59f0