hopefully fixed the way package names are chosen in cpack #869
Merge branch 'bugfixes/tokumx-1.3'