Merge "Use a different kernel boot line for the disk installer."