Added back changes from 1582 plus option to include both opcode and gimpact sources into compilation.
Added back changes from 1582 plus option to include both opcode and gimpact sources into compilation.

forrestv/opende,forrestv/opende,forrestv/opende,forrestv/opende,forrestv/opende