Merge "Fixes missing ramdisk and kernel in rpm"