updated deb and rpm package conflicts #1103

fixes #1103
Merge branch 'bugfixes/tokumx-1.4'