make entry_rm rpm compatible
Merge branch 'master' into dev