[upstream] last round of Kernel Configuration instructions layout change