Continuing work on CHOP-609 build time improvements.  Fixed eroneous additional_INCLUDE_DIRS setting for unit tests.
Continuing work on CHOP-609 build time improvements.  Fixed eroneous additional_INCLUDE_DIRS setting for unit tests.

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm