Defconfig: fix to Kexec option
Merge remote-tracking branch 'labodj/JWR-Prima' into sm-4.3-JWR-Plus-Prima

Conflicts:
	arch/arm/configs/franco_defconfig