Making the cmake variables more consistent.
Merge remote-tracking branch 'devel/130_download_test_files' into devel-master