Merge "Add bootsigner path as an option"