Fix typo in defconfig
Merge branch 'JBX_EDISON' into EDISON_WORKING