[entropy.server] fix dep_rewrites package additions handling
Merge remote-tracking branch 'upstream/master'