Merge pull request #3027 from rhabacker/fix-cmake-files-install-location