CMAKE changes for new MAVENized build dir structure

Signed-off-by: Rodrigo Pastrana <Rodrigo.Pastrana@lexisnexis.com>
Merge pull request #1 from rpastrana/mavtest

CMAKE changes for new MAVENized build dir structure