[PATCH] Minor kernel configs cleanup merging duplicated config opts into generic