Allow the use of Jtag independent of DFU_BUILD Support for build with CodeSourcery

Had a bad merge. Please include Missing Defines from merge	7dbf62c